tor

commit da179088ee1e687d154e60342cefb6c6080fcc15
parent 7037fe116359a9424cb6a20d88f38c0a422ebd68
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed, 20 Feb 2019 12:09:02 -0500

Merge branch 'tor-github/pr/687'

Diffstat:
A
changes/ticket29068
 | 
2
++
M
src/test/zero_length_keys.sh
 | 
6
+++---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changes/ticket29068 b/changes/ticket29068
@@ -0,0 +1,2 @@
+  o Code simplification and refactoring (shell scripts):
+    - Fix shellcheck warnings in zero_length_keys.sh. Resolves issue 29068.
diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh
@@ -19,7 +19,7 @@
 #   3: a command failed - the test could not be completed
 #
 
-if [ $# -eq 0 ] || [ ! -f ${1} ] || [ ! -x ${1} ]; then
+if [ $# -eq 0 ] || [ ! -f "${1}" ] || [ ! -x "${1}" ]; then
   echo "Usage: ${0} PATH_TO_TOR [-z|-d|-e]"
   exit 1
 elif [ $# -eq 1 ]; then
@@ -31,7 +31,7 @@ else #[$# -gt 1 ]; then
   shift
 fi
 
-DATA_DIR=`mktemp -d -t tor_zero_length_keys.XXXXXX`
+DATA_DIR=$(mktemp -d -t tor_zero_length_keys.XXXXXX)
 if [ -z "$DATA_DIR" ]; then
   echo "Failure: mktemp invocation returned empty string" >&2
   exit 3
@@ -40,7 +40,7 @@ if [ ! -d "$DATA_DIR" ]; then
   echo "Failure: mktemp invocation result doesn't point to directory" >&2
   exit 3
 fi
-trap "rm -rf '$DATA_DIR'" 0
+trap 'rm -rf "$DATA_DIR"' 0
 
 touch "$DATA_DIR"/empty_torrc