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

This commit is contained in:
Nick Mathewson 2019-02-19 11:56:48 -05:00
commit 6927e9a60c
2 changed files with 9 additions and 2 deletions

2
changes/bug29063 Normal file
View File

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

View File

@ -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