Browse Source

Fix shellcheck warning in test_rebind.sh

rl1987 5 years ago
parent
commit
00fff96e48
2 changed files with 9 additions and 2 deletions
  1. 2 0
      changes/bug29063
  2. 7 2
      src/test/test_rebind.sh

+ 2 - 0
changes/bug29063

@@ -0,0 +1,2 @@
+  o Code simplification and refactoring (shell scripts):
+    - Fix issues shellcheck found in test_rebind.sh. Resolves issue 29063.

+ 7 - 2
src/test/test_rebind.sh

@@ -15,10 +15,15 @@ fi
 exitcode=0
 
 tmpdir=
-clean () { test -n "$tmpdir" && test -d "$tmpdir" && rm -rf "$tmpdir" || :; }
+clean () {
+  if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then
+    rm -rf "$tmpdir"
+  fi
+}
+
 trap clean EXIT HUP INT TERM
 
-tmpdir="`mktemp -d -t tor_rebind_test.XXXXXX`"
+tmpdir="$(mktemp -d -t tor_rebind_test.XXXXXX)"
 if [ -z "$tmpdir" ]; then
   echo >&2 mktemp failed
   exit 2