From 5ff395e4a12c55ef8efcab25fee6a4e6378e1c9f Mon Sep 17 00:00:00 2001
From: Baptiste Mathus <batmat@batmat.net>
Date: Tue, 18 Sep 2018 00:28:28 +0200
Subject: [PATCH] Protect spaces in all tools commands

---
 tools/jq         |  4 ++--
 tools/jsonlint   |  4 ++--
 tools/mvn        |  4 ++--
 tools/node       | 18 +++++++++---------
 tools/shellcheck |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tools/jq b/tools/jq
index 41fcb3e..2d46144 100755
--- a/tools/jq
+++ b/tools/jq
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 exec docker run --rm \
-    -w ${PWD} \
-    -v ${PWD}:${PWD} \
+    -w "${PWD}" \
+    -v "${PWD}:${PWD}" \
     -i \
     realguess/jq:1.4 jq $@
diff --git a/tools/jsonlint b/tools/jsonlint
index 9c59003..5056071 100755
--- a/tools/jsonlint
+++ b/tools/jsonlint
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 exec docker run --rm \
-    -w ${PWD} \
-    -v ${PWD}:${PWD} \
+    -w "${PWD}" \
+    -v "${PWD}:${PWD}" \
     -i \
     sahsu/docker-jsonlint jsonlint $@
diff --git a/tools/mvn b/tools/mvn
index e7556c8..4979182 100755
--- a/tools/mvn
+++ b/tools/mvn
@@ -1,11 +1,11 @@
 #!/bin/sh -e
 
 MAVEN_REPO=~/.m2/
-mkdir -p $MAVEN_REPO/repository
+mkdir -p "$MAVEN_REPO/repository"
 
 exec docker run --rm \
     -v "$(pwd)":/usr/src/mymaven \
     -w /usr/src/mymaven \
-    -v $MAVEN_REPO:/var/maven/.m2 \
+    -v "$MAVEN_REPO:/var/maven/.m2" \
     --user $( id -u ) -e MAVEN_CONFIG=/var/maven/.m2 \
     maven:3.5.3-jdk-8 mvn -Duser.home=/var/maven $@
diff --git a/tools/node b/tools/node
index 061acbf..7ad1d10 100755
--- a/tools/node
+++ b/tools/node
@@ -7,7 +7,7 @@ if [ $? -eq 0 ]; then
     TTY_ARGS="-ti"
 fi;
 
-COMMAND=$@
+COMMAND="$@"
 
 # The caller is passing in some custom paraneters to the `node` binary, so we
 # need to override the entrypoint to explicitly call node
@@ -18,17 +18,17 @@ fi;
 
 exec docker run --net host --rm ${TTY_ARGS} \
     -u $(id -u):$(id -g) \
-    -w ${PWD} \
+    -w "${PWD}" \
     --mount type=tmpfs,destination=/.npm \
     --mount type=tmpfs,destination=/.config \
-    -v ${PWD}:${PWD} \
-    -e PATH="$PWD/node_modules/.bin:/usr/local/bin:$PATH" \
+    -v "${PWD}:${PWD}" \
+    -e "PATH=$PWD/node_modules/.bin:/usr/local/bin:$PATH" \
     -e LANG=C.UTF-8 \
-    -e DB_TRACING=$DB_TRACING \
-    -e LOG_LEVEL=$LOG_LEVEL \
-    -e DEBUG=$DEBUG \
-    -e FLAVOR=$FLAVOR \
-    -e SENTRY_DSN=$SENTRY_DSN \
+    -e "DB_TRACING=$DB_TRACING" \
+    -e "LOG_LEVEL=$LOG_LEVEL" \
+    -e "DEBUG=$DEBUG" \
+    -e "FLAVOR=$FLAVOR" \
+    -e "SENTRY_DSN=$SENTRY_DSN" \
     $(printenv | grep -i \^evergreen | awk '{ print "-e", $1 }') \
     $(printenv | grep -i \^node | awk '{ print "-e", $1 }') \
     node:10 \
diff --git a/tools/shellcheck b/tools/shellcheck
index 44b63f2..dd6fe5d 100755
--- a/tools/shellcheck
+++ b/tools/shellcheck
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
 exec docker run --rm \
-    -w ${PWD} \
-    -v ${PWD}:${PWD} \
+    -w "${PWD}" \
+    -v "${PWD}:${PWD}" \
     koalaman/shellcheck@sha256:6dfafef2730b851e7a8bceda7f2dbef93efb709932865924cb497423b60be582 $@