tor

commit 6927e9a60ca12fa67d6a33044c2903ce95ca1605
parent 0fc5fdc430968a62a0310fc7022c4562b4625bf2
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 19 Feb 2019 11:56:48 -0500

Merge remote-tracking branch 'tor-github/pr/665'

Diffstat:
A
changes/bug29063
 | 
2
++
M
src/test/test_rebind.sh
 | 
9
+++++++--

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/changes/bug29063 b/changes/bug29063
@@ -0,0 +1,2 @@
+  o Code simplification and refactoring (shell scripts):
+    - Fix issues shellcheck found in test_rebind.sh. Resolves issue 29063.
diff --git a/src/test/test_rebind.sh b/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