nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix/suppress shellcheck warnings in git-push-all.sh

Browse Source 
(I've chosen to suppress some instances rather than 'fix' them,
since the fix would require arrays or major refactoring.)

Fixes bug 31519; bug not in any released Tor.
This commit is contained in:
Nick Mathewson 2019-08-26 09:58:38 -04:00
parent 24bc2cd7b5
commit ca667b9a8a
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/git/git-push-all.sh
View File

@ -15,30 +15,37 @@ UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
# Add a delay between pushes, so CI runs on the most important branches first # Add a delay between pushes, so CI runs on the most important branches first
PUSH_DELAY=${TOR_PUSH_DELAY:-0} PUSH_DELAY=${TOR_PUSH_DELAY:-0}
PUSH_BRANCHES=`echo \ PUSH_BRANCHES=$(echo \
master \ master \
{release,maint}-0.4.1 \ {release,maint}-0.4.1 \
{release,maint}-0.4.0 \ {release,maint}-0.4.0 \
{release,maint}-0.3.5 \ {release,maint}-0.3.5 \
{release,maint}-0.2.9 \ {release,maint}-0.2.9 \
` )
if [ "$PUSH_DELAY" -le 0 ]; then if [ "$PUSH_DELAY" -le 0 ]; then
echo "Pushing $PUSH_BRANCHES" echo "Pushing $PUSH_BRANCHES"
# We know that there are no spaces in any branch within $PUSH_BRANCHES, so
# it is safe to use it unquoted. (This also applies to the other shellcheck
# exceptions below.)
#
# shellcheck disable=SC2086
git push --atomic "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES git push --atomic "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES
else else
PUSH_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V` 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)
MAINT_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint` MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint)
RELEASE_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \
tr "\n" " "` tr "\n" " ")
printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\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" "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES"
git push "$@" "$UPSTREAM_REMOTE" $MASTER_BRANCH git push "$@" "$UPSTREAM_REMOTE" "$MASTER_BRANCH"
sleep "$PUSH_DELAY" sleep "$PUSH_DELAY"
# shellcheck disable=SC2086
for b in $MAINT_BRANCHES; do for b in $MAINT_BRANCHES; do
git push "$@" "$UPSTREAM_REMOTE" $b git push "$@" "$UPSTREAM_REMOTE" $b
sleep "$PUSH_DELAY" sleep "$PUSH_DELAY"
done done
# shellcheck disable=SC2086
git push --atomic "$@" "$UPSTREAM_REMOTE" $RELEASE_BRANCHES git push --atomic "$@" "$UPSTREAM_REMOTE" $RELEASE_BRANCHES
fi fi