commit 8df6a65e6b86be70ab1d7f57b097913068ace72c Author: rl1987 rl1987@sdf.lonestar.org Date: Thu Feb 7 17:22:06 2019 +0200
Fix shellcheck warning in zero_length_keys.sh --- changes/ticket29068 | 2 ++ src/test/zero_length_keys.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changes/ticket29068 b/changes/ticket29068 new file mode 100644 index 000000000..77ef304f1 --- /dev/null +++ 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 index 3c61f8d46..4069148e0 100755 --- 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