diff options
| author | teor <teor@torproject.org> | 2019-11-06 16:00:50 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-06 16:21:01 +1000 |
| commit | e6b5a1ff939b286a6640305d4d49600dd3b7b574 (patch) | |
| tree | 62a32d7fd21491a4e877db7a5dbd56668785326a /scripts/git | |
| parent | f7b45975bf4d660d596542f5efd62fd152144199 (diff) | |
| download | tor-e6b5a1ff939b286a6640305d4d49600dd3b7b574.tar.gz tor-e6b5a1ff939b286a6640305d4d49600dd3b7b574.zip | |
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.
Diffstat (limited to 'scripts/git')
| -rwxr-xr-x | scripts/git/git-push-all.sh | 9 | ||||
| -rwxr-xr-x | scripts/git/git-setup-dirs.sh | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index a1ba754c2f..7bbeaecbd0 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 495b22b261..384c488995 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 |