November 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.2] shellcheck: Fix issues in the git-*.sh scripts
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 7f23d47f723edeea206d5438af3d109dbb4ac835 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 15:52:18 2019 +1000 shellcheck: Fix issues in the git-*.sh scripts Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code. --- changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++---------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/changes/bug32402_git_scripts b/changes/bug32402_git_scripts new file mode 100644 index 000000000..2b10a8998 --- /dev/null +++ b/changes/bug32402_git_scripts @@ -0,0 +1,3 @@ + o Minor bugfixes (shellcheck): + - Fix minor shellcheck errors in the git-*.sh scripts. + Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index e481b4097..bdd0da5b7 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 0d6daf432..dc1606638 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index a388f0156..7c43fe24d 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { @@ -237,7 +237,7 @@ if [ "$PUSH_SAME" -eq 0 ] && [ "$TEST_BRANCH_PREFIX" ]; then fi done if [ "$SKIP_UPSTREAM" ]; then - printf "Skipping unchanged: %s remote: %s\n" \ + printf "Skipping unchanged: %s remote: %s\\n" \ "$b" "$SKIP_UPSTREAM" else if [ "$NEW_PUSH_BRANCHES" ]; then @@ -261,18 +261,19 @@ if [ "$PUSH_DELAY" -le 0 ]; then $GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES else # Push the branches in optimal CI order, with a delay between each push - PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) + PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | sort -V) + MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep master) if [ -z "$TEST_BRANCH_PREFIX" ]; then - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) - RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ - tr "\n" " ") - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \ + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep maint) + RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep release | \ + tr "\\n" " ") + printf \ + "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n%s\\n" \ "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" else # Actually test branches based on maint branches - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n" \ + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep -v master) + printf "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n" \ "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" # No release branches RELEASE_BRANCHES=

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit c3a1e15a5ec8cdb1d28e2d57a77ce5deb6da39bb Merge: 10ef7a31c 7f23d47f7 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 21:28:28 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2 changes/bug32402 | 3 +++ changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++---------- scripts/maint/checkShellScripts.sh | 6 +----- 6 files changed, 20 insertions(+), 17 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 3d7433cd97d334859d202ce259ae32bc025cc9a7 Merge: cf56693f1 c3a1e15a5 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 21:30:39 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32402 | 3 +++ changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++---------- scripts/maint/checkShellScripts.sh | 6 +----- 6 files changed, 20 insertions(+), 17 deletions(-)

1 0

[tor/maint-0.4.2] shellcheck: Fix issues in the git-*.sh scripts
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 7f23d47f723edeea206d5438af3d109dbb4ac835 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 15:52:18 2019 +1000 shellcheck: Fix issues in the git-*.sh scripts Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code. --- changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++---------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/changes/bug32402_git_scripts b/changes/bug32402_git_scripts new file mode 100644 index 000000000..2b10a8998 --- /dev/null +++ b/changes/bug32402_git_scripts @@ -0,0 +1,3 @@ + o Minor bugfixes (shellcheck): + - Fix minor shellcheck errors in the git-*.sh scripts. + Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index e481b4097..bdd0da5b7 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 0d6daf432..dc1606638 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index a388f0156..7c43fe24d 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { @@ -237,7 +237,7 @@ if [ "$PUSH_SAME" -eq 0 ] && [ "$TEST_BRANCH_PREFIX" ]; then fi done if [ "$SKIP_UPSTREAM" ]; then - printf "Skipping unchanged: %s remote: %s\n" \ + printf "Skipping unchanged: %s remote: %s\\n" \ "$b" "$SKIP_UPSTREAM" else if [ "$NEW_PUSH_BRANCHES" ]; then @@ -261,18 +261,19 @@ if [ "$PUSH_DELAY" -le 0 ]; then $GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES else # Push the branches in optimal CI order, with a delay between each push - PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) + PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | sort -V) + MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep master) if [ -z "$TEST_BRANCH_PREFIX" ]; then - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) - RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ - tr "\n" " ") - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \ + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep maint) + RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep release | \ + tr "\\n" " ") + printf \ + "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n%s\\n" \ "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" else # Actually test branches based on maint branches - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n" \ + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep -v master) + printf "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n" \ "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" # No release branches RELEASE_BRANCHES=

1 0

[tor/maint-0.4.2] shellcheck: Start checking most scripts for errors
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 57baea701f8852b94d8ebc3fd8e70ccc998f5036 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 15:40:39 2019 +1000 shellcheck: Start checking most scripts for errors This check was accidentally disabled by a bad find command. Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code. --- changes/bug32402 | 3 +++ scripts/maint/checkShellScripts.sh | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changes/bug32402 b/changes/bug32402 new file mode 100644 index 000000000..0654389be --- /dev/null +++ b/changes/bug32402 @@ -0,0 +1,3 @@ + o Minor bugfixes (shellcheck): + - Start checking most scripts for shellcheck errors again. + Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/scripts/maint/checkShellScripts.sh b/scripts/maint/checkShellScripts.sh index 318f0fb57..4c872c7ee 100755 --- a/scripts/maint/checkShellScripts.sh +++ b/scripts/maint/checkShellScripts.sh @@ -35,12 +35,8 @@ if [ ! -d "$TOPLEVEL/src" ]; then fi # Check *.sh scripts, but ignore the ones that we can't fix -find "$TOPLEVEL" \ +find "$TOPLEVEL/contrib" "$TOPLEVEL/doc" "$TOPLEVEL/scripts" "$TOPLEVEL/src" \ -name "*.sh" \ - -path "$TOPLEVEL/contrib/*" \ - -path "$TOPLEVEL/doc/*" \ - -path "$TOPLEVEL/scripts/*" \ - -path "$TOPLEVEL/src/*" \ -not -path "$TOPLEVEL/src/ext/*" \ -not -path "$TOPLEVEL/src/rust/registry/*" \ -exec shellcheck {} +

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit c3a1e15a5ec8cdb1d28e2d57a77ce5deb6da39bb Merge: 10ef7a31c 7f23d47f7 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 21:28:28 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2 changes/bug32402 | 3 +++ changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++---------- scripts/maint/checkShellScripts.sh | 6 +----- 6 files changed, 20 insertions(+), 17 deletions(-)

1 0

[tor/master] Merge branch 'bug32402_042' into bug32402_master
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit f7b45975bf4d660d596542f5efd62fd152144199 Merge: 9ca25f3a6 7f23d47f7 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 16:14:06 2019 +1000 Merge branch 'bug32402_042' into bug32402_master Merge changes from master with shellcheck fixes. changes/bug32402 | 3 +++ changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++++-------- scripts/maint/checkShellScripts.sh | 6 +----- 6 files changed, 22 insertions(+), 15 deletions(-) diff --cc scripts/git/git-push-all.sh index ebfa57619,7c43fe24d..a1ba754c2 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@@ -257,7 -237,7 +257,7 @@@ if [ "$PUSH_SAME" -eq 0 ]; the fi done if [ "$SKIP_UPSTREAM" ]; then - printf "Skipping unchanged: %s matching remote: %s\n" \ - printf "Skipping unchanged: %s remote: %s\\n" \ ++ printf "Skipping unchanged: %s matching remote: %s\\n" \ "$b" "$SKIP_UPSTREAM" else if [ "$NEW_PUSH_BRANCHES" ]; then @@@ -287,18 -261,20 +287,23 @@@ if [ "$PUSH_DELAY" -le 0 ]; the $GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES else # Push the branches in optimal CI order, with a delay between each push - PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) \ + PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep master) ++ MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep master) \ + || true # Skipped master branch if [ -z "$TEST_BRANCH_PREFIX" ]; then - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) \ - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep maint) ++ MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep maint) \ + || true # Skipped all maint branches - RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ - tr "\n" " ") || true # Skipped all release branches + RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep release | \ - tr "\\n" " ") ++ tr "\\n" " ") || true # Skipped all release branches + printf \ + "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n%s\\n" \ + "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" else # Actually test branches based on maint branches - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) \ - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep -v master) ++ MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep -v master) \ + || true # Skipped all maint test branches + printf "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n" \ + "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" # No release branches RELEASE_BRANCHES= fi

1 0

[tor/master] shellcheck: Fix issues in the git-*.sh scripts
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 7f23d47f723edeea206d5438af3d109dbb4ac835 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 15:52:18 2019 +1000 shellcheck: Fix issues in the git-*.sh scripts Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code. --- changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++---------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/changes/bug32402_git_scripts b/changes/bug32402_git_scripts new file mode 100644 index 000000000..2b10a8998 --- /dev/null +++ b/changes/bug32402_git_scripts @@ -0,0 +1,3 @@ + o Minor bugfixes (shellcheck): + - Fix minor shellcheck errors in the git-*.sh scripts. + Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index e481b4097..bdd0da5b7 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 0d6daf432..dc1606638 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index a388f0156..7c43fe24d 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { @@ -237,7 +237,7 @@ if [ "$PUSH_SAME" -eq 0 ] && [ "$TEST_BRANCH_PREFIX" ]; then fi done if [ "$SKIP_UPSTREAM" ]; then - printf "Skipping unchanged: %s remote: %s\n" \ + printf "Skipping unchanged: %s remote: %s\\n" \ "$b" "$SKIP_UPSTREAM" else if [ "$NEW_PUSH_BRANCHES" ]; then @@ -261,18 +261,19 @@ if [ "$PUSH_DELAY" -le 0 ]; then $GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES else # Push the branches in optimal CI order, with a delay between each push - PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) + PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | sort -V) + MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep master) if [ -z "$TEST_BRANCH_PREFIX" ]; then - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) - RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ - tr "\n" " ") - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \ + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep maint) + RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep release | \ + tr "\\n" " ") + printf \ + "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n%s\\n" \ "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" else # Actually test branches based on maint branches - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n" \ + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep -v master) + printf "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n" \ "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" # No release branches RELEASE_BRANCHES=

1 0

[tor/master] shellcheck: Fix minor issues in some scripts
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit e6b5a1ff939b286a6640305d4d49600dd3b7b574 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 16:00:50 2019 +1000 shellcheck: Fix minor issues in some scripts Fix minor issues in git-push-all.sh, git-setup-dirs.sh and test_parseconf.sh. Fixes bug 32402; not in any released version of tor. Obviously correct changes to already reviewed code. --- scripts/git/git-push-all.sh | 9 +++++---- scripts/git/git-setup-dirs.sh | 6 ++++-- src/test/test_parseconf.sh | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index a1ba754c2..7bbeaecbd 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -309,15 +309,16 @@ else fi if [ "$MASTER_BRANCH" ] || [ "$MAINT_BRANCHES" ] \ || [ "$RELEASE_BRANCHES" ]; then - printf "Pushing with %ss delays, so CI runs in this order:\n" "$PUSH_DELAY" + printf "Pushing with %ss delays, so CI runs in this order:\\n" \ + "$PUSH_DELAY" if [ "$MASTER_BRANCH" ]; then - printf "%s\n" "$MASTER_BRANCH" + printf "%s\\n" "$MASTER_BRANCH" fi if [ "$MAINT_BRANCHES" ]; then - printf "%s\n" "$MAINT_BRANCHES" + printf "%s\\n" "$MAINT_BRANCHES" fi if [ "$RELEASE_BRANCHES" ]; then - printf "%s\n" "$RELEASE_BRANCHES" + printf "%s\\n" "$RELEASE_BRANCHES" fi fi # shellcheck disable=SC2086 diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh index 495b22b26..384c48899 100755 --- a/scripts/git/git-setup-dirs.sh +++ b/scripts/git/git-setup-dirs.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { @@ -295,8 +295,10 @@ function add_remote printf " %s Adding remote %s at %s..." "$MARKER" "$1" "$2" local check_cmd="git remote get-url '$1'" msg=$( eval "$check_cmd" 2>&1 ) + ret=$? # We don't want a remote, so we invert the exit status - if validate_ret_skip $[ ! $? ] "Remote already exists for $1 at $msg."; then + if validate_ret_skip $(( ! ret )) \ + "Remote already exists for $1 at $msg."; then return fi if [ $DRY_RUN -eq 0 ]; then diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh index 86a00f7a0..6799e13ae 100755 --- a/src/test/test_parseconf.sh +++ b/src/test/test_parseconf.sh @@ -88,7 +88,7 @@ TOR_BINARY="$(abspath "$TOR_BINARY")" echo "TOR BINARY IS ${TOR_BINARY}" TOR_MODULES_DISABLED="$("$TOR_BINARY" --list-modules | grep ": no" \ - | cut -d ":" -f1 | sort | tr "\n" "_")" + | cut -d ":" -f1 | sort | tr "\\n" "_")" # Remove the last underscore, if there is one TOR_MODULES_DISABLED=${TOR_MODULES_DISABLED%_} @@ -239,7 +239,7 @@ for dir in "${EXAMPLEDIR}"/*; do > "${DATA_DIR}/output.${testname}" \ && die "FAIL: $ERROR: Tor did not report an error." - expect_err="$(cat $ERROR)" + expect_err="$(cat "$ERROR")" if grep "${expect_err}" "${DATA_DIR}/output.${testname}" >/dev/null; then echo "OK" else

1 0

[tor/master] shellcheck: Start checking most scripts for errors
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 57baea701f8852b94d8ebc3fd8e70ccc998f5036 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 15:40:39 2019 +1000 shellcheck: Start checking most scripts for errors This check was accidentally disabled by a bad find command. Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code. --- changes/bug32402 | 3 +++ scripts/maint/checkShellScripts.sh | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changes/bug32402 b/changes/bug32402 new file mode 100644 index 000000000..0654389be --- /dev/null +++ b/changes/bug32402 @@ -0,0 +1,3 @@ + o Minor bugfixes (shellcheck): + - Start checking most scripts for shellcheck errors again. + Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/scripts/maint/checkShellScripts.sh b/scripts/maint/checkShellScripts.sh index 318f0fb57..4c872c7ee 100755 --- a/scripts/maint/checkShellScripts.sh +++ b/scripts/maint/checkShellScripts.sh @@ -35,12 +35,8 @@ if [ ! -d "$TOPLEVEL/src" ]; then fi # Check *.sh scripts, but ignore the ones that we can't fix -find "$TOPLEVEL" \ +find "$TOPLEVEL/contrib" "$TOPLEVEL/doc" "$TOPLEVEL/scripts" "$TOPLEVEL/src" \ -name "*.sh" \ - -path "$TOPLEVEL/contrib/*" \ - -path "$TOPLEVEL/doc/*" \ - -path "$TOPLEVEL/scripts/*" \ - -path "$TOPLEVEL/src/*" \ -not -path "$TOPLEVEL/src/ext/*" \ -not -path "$TOPLEVEL/src/rust/registry/*" \ -exec shellcheck {} +

1 0