From 2adbb68a541a959b8c0e69b61bcb91a4ff699055 Mon Sep 17 00:00:00 2001 From: Robert Hafner Date: Thu, 5 Dec 2013 14:06:51 -0800 Subject: [PATCH] Updated SetupEnvironment to use TRAVIS_BUILD_DIR to identify paths --- tests/SetupEnvironment.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/SetupEnvironment.sh b/tests/SetupEnvironment.sh index 7f3e72c..1ced90f 100755 --- a/tests/SetupEnvironment.sh +++ b/tests/SetupEnvironment.sh @@ -1,17 +1,17 @@ #!/bin/sh -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - if [ -n "$TRAVIS" ]; then echo 'Travis config not yet written' - cp -Rp $DIR/resources /resources + cp -Rp $TRAVIS_BUILD_DIR/tests/resources /resources /bin/bash /resources/Scripts/Provision.sh else # Since not in travis, lets load up a system with vagrant + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + cd $DIR/vagrant VAGRANTSTATUS=$(vagrant status)