diff --git a/.travis/script.sh b/.travis/script.sh
index b723f5dd0..a6d87b37f 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -22,7 +22,7 @@ else
 	"$TRAVIS_BUILD_DIR/.travis/$TRAVIS_OS_NAME.$TARGET_OS.script.sh"
 
 	# Package and upload non-tagged builds
-	if [ ! -z "$TRAVIS_TAG" ]; then
+	if [ -n "$TRAVIS_TAG" ]; then
 		# Skip, handled by travis deploy instead
 		exit 0
 	elif [[ $TARGET_OS == win* ]]; then
diff --git a/cmake/linux/package_linux.sh.in b/cmake/linux/package_linux.sh.in
index dcbb6cb54..adcf9daa2 100644
--- a/cmake/linux/package_linux.sh.in
+++ b/cmake/linux/package_linux.sh.in
@@ -108,7 +108,7 @@ chmod +x "${APPDIR}usr/bin/lmms"
 unset LD_LIBRARY_PATH
 
 # Ensure linuxdeployqt can find shared objects
-export LD_LIBRARY_PATH="${APPDIR}usr/lib/lmms/":"${APPDIR}usr/lib/lmms/optional":$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="${APPDIR}"usr/lib/lmms/:"${APPDIR}"usr/lib/lmms/optional:"$LD_LIBRARY_PATH"
 
 # Handle wine linking
 if [ -d "@WINE_32_LIBRARY_DIR@" ]; then
diff --git a/cmake/msys/extract_debs.sh b/cmake/msys/extract_debs.sh
index cb2a868d3..939912bb2 100644
--- a/cmake/msys/extract_debs.sh
+++ b/cmake/msys/extract_debs.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 ppa_dir=./ppa/
 
 pushd $ppa_dir
diff --git a/cmake/msys/msys_helper.sh b/cmake/msys/msys_helper.sh
index 294edd476..a6a7e6aae 100644
--- a/cmake/msys/msys_helper.sh
+++ b/cmake/msys/msys_helper.sh
@@ -68,7 +68,7 @@ stkver="4.5.1"
 mingw_root="/$(echo "$MSYSTEM"|tr '[:upper:]' '[:lower:]')"
 
 info "Downloading and building fltk $fltkver"
-if ! which fluid; then
+if ! command -v fluid; then
 	wget http://fltk.org/pub/fltk/$fltkver/fltk-$fltkver-source.tar.gz -O "$HOME/fltk-source.tar.gz"
 	tar zxf "$HOME/fltk-source.tar.gz" -C "$HOME/"
 	pushd "$HOME/fltk-$fltkver"