quote and library paths for use in passc/passl to allow embedded spaces (#79)

Author: tersec

.github/workflows/ci.yml

@@ -26,10 +26,10 @@ jobs:
         include:
           - target:
               os: linux
-            builder: ubuntu-20.04
+            builder: ubuntu-latest
           - target:
               os: macos
-            builder: macos-12
+            builder: macos-latest
           - target:
               os: windows
             builder: windows-latest

makefiles/targets.mk

@@ -150,7 +150,7 @@ endif
 $(NIMBLE_DIR):
 	mkdir -p $(NIMBLE_DIR)/pkgs
 	NIMBLE_DIR="$(CURDIR)/$(NIMBLE_DIR)" PWD_CMD="$(PWD)" EXCLUDED_NIM_PACKAGES="$(EXCLUDED_NIM_PACKAGES)" \
-		git submodule foreach --recursive --quiet '$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/create_nimble_link.sh "$$sm_path"'
+		git submodule foreach --recursive --quiet '"$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/create_nimble_link.sh" "$$sm_path"'
 
 clean-cross:
 	+ [[ -e vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc ]] && "$(MAKE)" -C vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc CC=$(CC) clean $(HANDLE_OUTPUT) || true

scripts/create_nbs_paths.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
 
 cd "$TOP_LEVEL_DIR"
 
@@ -9,17 +11,17 @@ cd "$TOP_LEVEL_DIR"
 # invocations may get interleaved.
 temp_nbs_paths=$(mktemp nimbus-build-system.paths.XXXXXXXXXXXXXXX)
 
-echo "--noNimblePath" > $temp_nbs_paths
-for file in $(ls -d $PWD/vendor/*)
+echo "--noNimblePath" > "${temp_nbs_paths}"
+for file in $(ls -d "$PWD/vendor"/*)
 do
   if uname | grep -qiE "mingw|msys"; then
-    file=$(cygpath -m $file)
+    file=$(cygpath -m "${file}")
   fi
   if [ -d "$file/src" ]; then
     echo --path:"\"$file/src\""
   else
     echo --path:"\"$file\""
   fi
-done >> $temp_nbs_paths
+done >> "${temp_nbs_paths}"
 
-mv $temp_nbs_paths nimbus-build-system.paths
+mv "${temp_nbs_paths}" nimbus-build-system.paths

scripts/env.sh

@@ -15,8 +15,8 @@ export NIMC=${NIMC:-nim}
 
 # We use ${BASH_SOURCE[0]} instead of $0 to allow sourcing this file
 # and we fall back to a Zsh-specific special var to also support Zsh.
-export REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})"
-export ABS_PATH="$(cd ${REL_PATH}; pwd)"
+export REL_PATH="$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")"
+export ABS_PATH="$(cd "${REL_PATH}"; pwd)"
 # do we still need this?
 #ABS_PATH_NATIVE="$(cd ${REL_PATH}; ${PWD_CMD})"