commit f7b45975bf4d660d596542f5efd62fd152144199
parent 9ca25f3a68374ca4787b4eaa8bf4fb3365061d26
Author: teor <teor@torproject.org>
Date: Wed, 6 Nov 2019 16:14:06 +1000
Merge branch 'bug32402_042' into bug32402_master
Merge changes from master with shellcheck fixes.
Diffstat:
6 files changed, 22 insertions(+), 15 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()
{
@@ -257,7 +257,7 @@ if [ "$PUSH_SAME" -eq 0 ]; then
fi
done
if [ "$SKIP_UPSTREAM" ]; then
- printf "Skipping unchanged: %s matching remote: %s\n" \
+ printf "Skipping unchanged: %s matching remote: %s\\n" \
"$b" "$SKIP_UPSTREAM"
else
if [ "$NEW_PUSH_BRANCHES" ]; then
@@ -287,18 +287,23 @@ 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) \
|| 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) \
|| 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" " ") || 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) \
|| 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
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 {} +
