diff --git a/.travis/common/windows-build.sh b/.travis/common/windows-build.sh
index 93a1f3a49..c2c3c79ea 100755
--- a/.travis/common/windows-build.sh
+++ b/.travis/common/windows-build.sh
@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
+set -e
 
-CPUS=$(cat /proc/cpuinfo | grep bogo | wc -l)
+CPUS=$(grep -c bogo /proc/cpuinfo)
 
 cd /lmms
 
 mkdir build
 cd build
 
-../cmake/build_mingw$1.sh
+../cmake/build_mingw"$1".sh
 
-echo Building on $CPUS CPUs
+echo Building on "$CPUS" CPUs
 make -j$((CPUS+1))
 
 make package
diff --git a/.travis/linux.win32.before_install.sh b/.travis/linux.win32.before_install.sh
index fbf79a62e..ef9f8233d 100755
--- a/.travis/linux.win32.before_install.sh
+++ b/.travis/linux.win32.before_install.sh
@@ -2,5 +2,5 @@
 
 set -e
 
-docker build -t lmms-build ${TRAVIS_BUILD_DIR}/.travis/linux.cross.win32/
+docker build -t lmms-build "${TRAVIS_BUILD_DIR}/.travis/linux.cross.win32/"
 
diff --git a/.travis/linux.win32.script.sh b/.travis/linux.win32.script.sh
index 7fe3b4c31..263a5ffd0 100755
--- a/.travis/linux.win32.script.sh
+++ b/.travis/linux.win32.script.sh
@@ -3,5 +3,5 @@
 set -e
 
 export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
-docker run -v ${TRAVIS_BUILD_DIR}:/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win32/script.sh
+docker run -v "${TRAVIS_BUILD_DIR}":/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win32/script.sh
 
diff --git a/.travis/linux.win64.before_install.sh b/.travis/linux.win64.before_install.sh
index a254fdc27..40cf3674e 100755
--- a/.travis/linux.win64.before_install.sh
+++ b/.travis/linux.win64.before_install.sh
@@ -2,5 +2,5 @@
 
 set -e
 
-docker build -t lmms-build ${TRAVIS_BUILD_DIR}/.travis/linux.cross.win64/
+docker build -t lmms-build "${TRAVIS_BUILD_DIR}/.travis/linux.cross.win64/"
 
diff --git a/.travis/linux.win64.script.sh b/.travis/linux.win64.script.sh
index 29da2a437..5e2485c6d 100755
--- a/.travis/linux.win64.script.sh
+++ b/.travis/linux.win64.script.sh
@@ -3,5 +3,5 @@
 set -e
 
 export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
-docker run -v ${TRAVIS_BUILD_DIR}:/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win64/script.sh
+docker run -v "${TRAVIS_BUILD_DIR}":/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win64/script.sh