diff --git a/scripts/linux/build.sh b/scripts/linux/build.sh
index 952f375c1f..7ce8a22901 100755
--- a/scripts/linux/build.sh
+++ b/scripts/linux/build.sh
@@ -14,49 +14,48 @@ mkdir -p $cachedir
 
 # Sets default target to "linux", if none specified
 TARGET=${TARGET-linux}
-SYSTEM=$(uname -s)
 
 if [[ ! -d build ]]; then
 	mkdir -p build
 fi
 
 pushd build
-	echo OPENRCT2_CMAKE_OPTS = $OPENRCT2_CMAKE_OPTS
+	echo OPENRCT2_CMAKE_OPTS = "$OPENRCT2_CMAKE_OPTS"
 	if [[ $TARGET == "docker32" ]]
 	then
 		PARENT=$(readlink -f ../)
-		chmod a+rwx $(pwd)
-		chmod g+s $(pwd)
+		chmod a+rwx "$(pwd)"
+		chmod g+s "$(pwd)"
 		# CMAKE and MAKE opts from environment
-		docker run -u travis -v $PARENT:$PARENT -w $PARENT/build -i -t openrct2/openrct2:32bit-only bash -c "cmake ../ -DFORCE32=on $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS"
+		docker run -u travis -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:32bit-only bash -c "cmake ../ -DFORCE32=on $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS"
 	elif [[ $TARGET == "docker64" ]]
 	then
 		PARENT=$(readlink -f ../)
-		chmod a+rwx $(pwd)
-		chmod g+s $(pwd)
+		chmod a+rwx "$(pwd)"
+		chmod g+s "$(pwd)"
 		# CMAKE and MAKE opts from environment
-		docker run -v $PARENT:$PARENT -w $PARENT/build -i -t openrct2/openrct2:64bit-only bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS && make test ARGS=\"-V\""
+		docker run -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:64bit-only bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS && make test ARGS=\"-V\""
 	elif [[ $TARGET == "ubuntu_i686" ]]
 	then
 		PARENT=$(readlink -f ../)
-		chmod a+rwx $(pwd)
-		chmod g+s $(pwd)
+		chmod a+rwx "$(pwd)"
+		chmod g+s "$(pwd)"
 		# CMAKE and MAKE opts from environment
-		docker run -v $PARENT:$PARENT -w $PARENT/build -i -t openrct2/openrct2:ubuntu_i686 bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && make all testpaint install $OPENRCT_MAKE_OPTS && make test ARGS=\"-V\" && ( ./testpaint --quiet ||  if [[ \$? -eq 1 ]] ; then echo Allowing failed tests to pass ; else echo here ; false; fi )"
+		docker run -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:ubuntu_i686 bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && make all testpaint install $OPENRCT_MAKE_OPTS && make test ARGS=\"-V\" && ( ./testpaint --quiet ||  if [[ \$? -eq 1 ]] ; then echo Allowing failed tests to pass ; else echo here ; false; fi )"
 	elif [[ $TARGET == "ubuntu_amd64" ]]
 	then
 		PARENT=$(readlink -f ../)
-		chmod a+rwx $(pwd)
-		chmod g+s $(pwd)
+		chmod a+rwx "$(pwd)"
+		chmod g+s "$(pwd)"
 		# CMAKE and MAKE opts from environment
-		docker run -v $PARENT:$PARENT -w $PARENT/build -i -t openrct2/openrct2:ubuntu_amd64 bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS install && make test ARGS=\"-V\""
+		docker run -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:ubuntu_amd64 bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS install && make test ARGS=\"-V\""
 	elif [[ $TARGET == "windows" ]]
 	then
 		PARENT=$(readlink -f ../)
-		chmod a+rwx $(pwd)
-		chmod g+s $(pwd)
+		chmod a+rwx "$(pwd)"
+		chmod g+s "$(pwd)"
 		# CMAKE and MAKE opts from environment
-		docker run -v $PARENT:$PARENT -w $PARENT/build -i -t openrct2/openrct2:mingw-arch bash -c "cmake ../ $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS"
+		docker run -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:mingw-arch bash -c "cmake ../ $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS"
 	else
 		echo "Unkown target $TARGET"
 		exit 1