Merge pull request #89 from DigitalSlideArchive/fix-parameter-escaping

Fix bash parameter escaping as passed to docker.
DigitalSlideArchive · Mar 20, 2020 · 3565f5a · 3565f5a
2 parents 2be50cc + 9369606
commit 3565f5a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/devops/build.sh b/devops/build.sh
@@ -4,7 +4,9 @@
 #   --watch-plugin histomicsui
 # to the command line.
 
-var="$@"
+# @@Q quotes each parameter.  echo forms a single string that can be added to 
+# a command without further quoting.
+var=$(echo "${@@Q}")
 
 # We build in dev mode to get source maps on the client
-docker exec -it dsa_girder bash -lc "girder build --dev \"$var\""
+docker exec -it dsa_girder bash -lc "girder build --dev $var"
diff --git a/devops/test.sh b/devops/test.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
-var="$@"
+# @@Q quotes each parameter.  echo forms a single string that can be added to 
+# a command without further quoting.
+var=$(echo "${@@Q}")
+
+docker exec -it dsa_girder bash -lc "tox $var"
 
-docker exec -it dsa_girder bash -lc "tox \"$var\""