diff --git a/scripts/build.sh b/scripts/build.sh
index c7adc1a07..d7fca1c14 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -30,7 +30,7 @@ rm -rf pkg/*
 mkdir -p bin/
 
 # If its dev mode, only build for ourself
-if [ "${NOMAD_DEV}x" != "x" ]; then
+if [[ "${NOMAD_DEV}" ]]; then
     XC_OS=$(go env GOOS)
     XC_ARCH=$(go env GOARCH)
 fi
@@ -65,7 +65,7 @@ for F in $(find ${DEV_PLATFORM} -mindepth 1 -maxdepth 1 -type f); do
     cp ${F} ${MAIN_GOPATH}/bin/
 done
 
-if [ "${NOMAD_DEV}x" = "x" ]; then
+if [[ "${NOMAD_DEV}" ]]; then
     # Zip and copy to the dist dir
     echo "==> Packaging..."
     for PLATFORM in $(find ./pkg -mindepth 1 -maxdepth 1 -type d); do