tor

commit c3a1e15a5ec8cdb1d28e2d57a77ce5deb6da39bb
parent 10ef7a31cfa896fb8a4eddde92c4b7d1e7477ad6
Author: teor <teor@torproject.org>
Date:   Wed,  6 Nov 2019 21:28:28 +1000

Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2

Diffstat:
A
changes/bug32402
 | 
3
+++
A
changes/bug32402_git_scripts
 | 
3
+++
M
scripts/git/git-merge-forward.sh
 | 
2
+-
M
scripts/git/git-pull-all.sh
 | 
2
+-
M
scripts/git/git-push-all.sh
 | 
21
+++++++++++----------
M
scripts/maint/checkShellScripts.sh
 | 
6
+-----

6 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/changes/bug32402 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/changes/bug32402_git_scripts 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
@@ -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
@@ -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
@@ -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=
diff --git 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 {} +