admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

update-bash: use array for QUIET_ARGS

Browse Source 
Per @UniqMartin's advice, avoid disabling shellcheck rules.

Closes Homebrew/homebrew#48286.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2016-01-21 18:53:42 +08:00
parent e9096b0701
commit e3687a5ba2
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Library/Homebrew/cmd/update-bash.sh
View File

@ -103,11 +103,9 @@ read_current_revision() {
git rev-parse -q --verify HEAD git rev-parse -q --verify HEAD
} }
# Don't warn about QUIET_ARGS; they need to be unquoted.
# shellcheck disable=SC2086
pop_stash() { pop_stash() {
[[ -z "$STASHED" ]] && return [[ -z "$STASHED" ]] && return
git stash pop $QUIET_ARGS git stash pop "${QUIET_ARGS[@]}"
if [[ -n "$HOMEBREW_VERBOSE" ]] if [[ -n "$HOMEBREW_VERBOSE" ]]
then then
echo "Restoring your stashed changes to $DIR:" echo "Restoring your stashed changes to $DIR:"
@ -123,8 +121,6 @@ pop_stash_message() {
unset STASHED unset STASHED
} }
# Don't warn about QUIET_ARGS; they need to be unquoted.
# shellcheck disable=SC2086
reset_on_interrupt() { reset_on_interrupt() {
if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]] if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]]
then then
@ -133,7 +129,7 @@ reset_on_interrupt() {
if [[ -n "$INITIAL_REVISION" ]] if [[ -n "$INITIAL_REVISION" ]]
then then
git reset --hard "$INITIAL_REVISION" $QUIET_ARGS git reset --hard "$INITIAL_REVISION" "${QUIET_ARGS[@]}"
fi fi
if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]] if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]]
@ -146,8 +142,6 @@ reset_on_interrupt() {
exit 130 exit 130
} }
# Don't warn about QUIET_ARGS; they need to be unquoted.
# shellcheck disable=SC2086
pull() { pull() {
local DIR local DIR
local TAP_VAR local TAP_VAR
@ -190,8 +184,8 @@ pull() {
fi fi
git -c "user.email=brew-update@localhost" \ git -c "user.email=brew-update@localhost" \
-c "user.name=brew update" \ -c "user.name=brew update" \
stash save --include-untracked $QUIET_ARGS stash save --include-untracked "${QUIET_ARGS[@]}"
git reset --hard $QUIET_ARGS git reset --hard "${QUIET_ARGS[@]}"
STASHED="1" STASHED="1"
fi fi
@ -201,9 +195,9 @@ pull() {
# it to `origin/#{@upstream_branch}`. Otherwise, just check it out. # it to `origin/#{@upstream_branch}`. Otherwise, just check it out.
if git merge-base --is-ancestor "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" &>/dev/null if git merge-base --is-ancestor "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" &>/dev/null
then then
git checkout --force "$UPSTREAM_BRANCH" $QUIET_ARGS git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
else else
git checkout --force -B "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" $QUIET_ARGS git checkout --force -B "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
fi fi
fi fi
@ -215,9 +209,9 @@ pull() {
if [[ -n "$HOMEBREW_REBASE" ]] if [[ -n "$HOMEBREW_REBASE" ]]
then then
git rebase $QUIET_ARGS "origin/$UPSTREAM_BRANCH" git rebase "${QUIET_ARGS[@]}" "origin/$UPSTREAM_BRANCH"
else else
git merge --no-edit --ff $QUIET_ARGS "origin/$UPSTREAM_BRANCH" git merge --no-edit --ff "${QUIET_ARGS[@]}" "origin/$UPSTREAM_BRANCH"
fi fi
export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$(read_current_revision)" export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$(read_current_revision)"
@ -226,7 +220,7 @@ pull() {
if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]] if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]]
then then
git checkout "$INITIAL_BRANCH" $QUIET_ARGS git checkout "$INITIAL_BRANCH" "${QUIET_ARGS[@]}"
pop_stash pop_stash
else else
pop_stash_message pop_stash_message
@ -295,7 +289,9 @@ EOS
if [[ -z "$HOMEBREW_VERBOSE" ]] if [[ -z "$HOMEBREW_VERBOSE" ]]
then then
QUIET_ARGS="-q" QUIET_ARGS=(-q)
else
QUIET_ARGS=()
fi fi
# ensure GIT_CONFIG is unset as we need to operate on .git/config # ensure GIT_CONFIG is unset as we need to operate on .git/config
@ -316,7 +312,7 @@ EOS
cd "$DIR" || continue cd "$DIR" || continue
UPSTREAM_BRANCH="$(upstream_branch)" UPSTREAM_BRANCH="$(upstream_branch)"
# the refspec ensures that the default upstream branch gets updated # the refspec ensures that the default upstream branch gets updated
git fetch $QUIET_ARGS origin \ git fetch "${QUIET_ARGS[@]}" origin \
"refs/heads/$UPSTREAM_BRANCH:refs/remotes/origin/$UPSTREAM_BRANCH" & "refs/heads/$UPSTREAM_BRANCH:refs/remotes/origin/$UPSTREAM_BRANCH" &
done done