commit 00fff96e4884e295a767532aa570abf8d27e75ee Author: rl1987 rl1987@sdf.lonestar.org Date: Tue Jan 22 15:14:16 2019 +0200

Fix shellcheck warning in test_rebind.sh --- changes/bug29063 | 2 ++ src/test/test_rebind.sh | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/changes/bug29063 b/changes/bug29063 new file mode 100644 index 000000000..8cbcbebc6 --- /dev/null +++ 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 index 498072de3..a8f07c7c1 100755 --- 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