fix setup script

Skycoder42 · Skycoder42 · commit 72c22e12ba95 · 2017-11-14T23:41:19.000+01:00
diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh
@@ -3,20 +3,13 @@ set -e
 
 buildFileName=build.sh
 
-if [[ $PLATFORM == "gcc_64" ]]; then
-	mv ./qtmodules-travis/ci/linux/setup-docker.sh ./qtmodules-travis/ci/linux/setup-docker.sh.tmp
-	mv $(dirname "$0")/setup-docker.sh ./qtmodules-travis/ci/linux/setup-docker.sh
-	cat ./qtmodules-travis/ci/linux/setup-docker.sh.tmp >> ./qtmodules-travis/ci/linux/setup-docker.sh
+if [[ $TRAVIS_OS_NAME == "linux" ]]; then
+	mv ./qtmodules-travis/ci/linux/setup/setup-docker.sh ./qtmodules-travis/ci/linux/setup/setup-docker.sh.tmp
+	mv $(dirname "$0")/setup-docker.sh ./qtmodules-travis/ci/linux/setup/setup-docker.sh
+	cat ./qtmodules-travis/ci/linux/setup/setup-docker.sh.tmp >> ./qtmodules-travis/ci/linux/setup/setup-docker.sh
 
-	buildFileName=build-all.sh
+	buildFileName=build-docker.sh
 else
-	if [[ $TRAVIS_OS_NAME == "linux" ]]; then
-		curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
-		sudo apt-get install -y nodejs
-
-		buildFileName=build-all.sh
-	fi
-
 	sudo npm install -g json-server
 fi
 
