chore: Fix more Bash inconsistencies (#1021)

Author: hyperupcall

bin/git-archive-file

@@ -9,15 +9,15 @@ ARCHIVE_NAME=$(basename "$(pwd)")
 
 if [[ $BRANCH = tags* ]]; then
     BRANCH=$(git describe)
-    echo Building for tag \"$BRANCH\"
+    echo Building for tag "\"$BRANCH\""
     FILENAME=$ARCHIVE_NAME.$BRANCH.zip
 else
-    echo Building archive on branch \"$BRANCH\"
+    echo Building archive on branch "\"$BRANCH\""
     # get a version string, so archives will not be overwritten when creating
     # many of them
     VERSION=$(git describe --always --long)
     # if not on master append branch name into the filename
-    if [ "$BRANCH" = $(git_extra_default_branch) ]; then
+    if [ "$BRANCH" = "$(git_extra_default_branch)" ]; then
         FILENAME=$ARCHIVE_NAME.$VERSION.zip
     else
         FILENAME=$ARCHIVE_NAME.$VERSION.$BRANCH.zip
@@ -31,7 +31,7 @@ FILENAME=${FILENAME//\\/-}
 OUTPUT=$(pwd)/$FILENAME
 
 # building archive
-git archive --format zip --output "$OUTPUT" $BRANCH
+git archive --format zip --output "$OUTPUT" "$BRANCH"
 
 # also display size of the resulting file
 echo Saved to \""$FILENAME"\" \("$(du -h "$OUTPUT" | cut -f1)"\)

bin/git-browse

@@ -18,7 +18,7 @@ if [[ $remote == "" ]]; then
 fi
 
 # get remote url
-remote_url=$(git remote get-url $remote)
+remote_url=$(git remote get-url "$remote")
 
 if [[ $? -ne 0 ]]; then
     exit $?

bin/git-browse-ci

@@ -9,7 +9,7 @@ else
     remote=$1
 fi
 
-if [[ $remote == "" ]]
+if [[ -z $remote ]]
 then
     echo "Remote not found"
     exit 1

bin/git-bulk

@@ -89,10 +89,10 @@ function checkGitCommand () {
 
 # check if workspace name is registered
 function checkWSName () {
-  while read workspace; do
+  while read -r workspace; do
     parseWsName "$workspace"
     if [[ $rwsname == "$wsname" ]]; then return; fi
-  done <<< "$(echo "$(listall)")"
+  done <<< "$(listall)"
   # when here the ws name was not found
   usage && echo 1>&2 "error: unknown workspace name: $wsname" && exit 1
 }
@@ -106,14 +106,14 @@ function parseWsName () {
 
 # detects the wsname of the current directory
 function wsnameToCurrent () {
-  while read workspace; do
+  while read -r workspace; do
     if [ -z "$workspace" ]; then continue; fi
     parseWsName "$workspace"
     if echo "$PWD" | grep -o -q "$rwsdir"; then wsname="$rwsname" && return; fi
-  done <<< "$(echo "$(listall)")"
+  done <<< "$(listall)"
   # when here then not in workspace dir
   echo 1>&2 "error: you are not in a workspace directory. your registered workspaces are:" && \
-    wslist="$(echo "$(listall)")" && echo 1>&2 "${wslist:-'<no workspaces defined yet>'}" && exit 1
+    wslist="$(listall)" && echo 1>&2 "${wslist:-'<no workspaces defined yet>'}" && exit 1
 }
 
 # helper to check number of arguments.

bin/git-create-branch

@@ -44,20 +44,20 @@ test -z $BRANCH && echo "branch argument required." 1>&2 && exit 1
 if [[ -n $REMOTE ]]
 then
 	stderr=$(git_extra_mktemp)
-	git ls-remote --exit-code $REMOTE 1>/dev/null 2>"$stderr"
+	git ls-remote --exit-code "$REMOTE" 1>/dev/null 2>"$stderr"
 	REMOTE_EXIT=$?
 	REMOTE_ERROR=$(<"$stderr")
 	rm -f "$stderr"
 	if [ $REMOTE_EXIT -eq 0 ]
 	then
 		if [[ -n $START_POINT ]]; then
-			git fetch $REMOTE
-			git checkout --track -b $BRANCH $START_POINT
-			git push $REMOTE HEAD:refs/heads/$BRANCH
+			git fetch "$REMOTE"
+			git checkout --track -b "$BRANCH" "$START_POINT"
+			git push "$REMOTE" "HEAD:refs/heads/$BRANCH"
 		else
-			git push $REMOTE HEAD:refs/heads/$BRANCH
-			git fetch $REMOTE
-			git checkout --track -b $BRANCH $REMOTE/$BRANCH
+			git push "$REMOTE" "HEAD:refs/heads/$BRANCH"
+			git fetch "$REMOTE"
+			git checkout --track -b "$BRANCH" "$REMOTE/$BRANCH"
 		fi
 		exit $?
 	else
@@ -70,7 +70,7 @@ fi
 
 if [[ -n $START_POINT ]]
 then
-    git checkout -b $BRANCH "$START_POINT"
+    git checkout -b "$BRANCH" "$START_POINT"
 else
-    git checkout -b $BRANCH
+    git checkout -b "$BRANCH"
 fi

bin/git-delete-branch

@@ -2,16 +2,16 @@
 set -e
 
 # Assert there is at least one branch provided
-test -z $1 && echo "branch required." 1>&2 && exit 1
+test -z "$1" && echo "branch required." 1>&2 && exit 1
 
 for branch in "$@"
 do
-  remote=$(git config branch.$branch.remote || echo "origin")
-  ref=$(git config branch.$branch.merge || echo "refs/heads/$branch")
+  remote=$(git config "branch.$branch.remote" || echo "origin")
+  ref=$(git config "branch.$branch.merge" || echo "refs/heads/$branch")
 
-  git branch -D $branch || true
+  git branch -D "$branch" || true
   # Avoid deleting local upstream
-  [ "$remote" == "." ] && continue
-  git branch -d -r $remote/$branch || continue
-  git push $remote :$ref
+  [ "$remote" = "." ] && continue
+  git branch -d -r "$remote/$branch" || continue
+  git push "$remote" ":$ref"
 done

bin/git-delete-squashed-branches

@@ -12,7 +12,7 @@ fi
 git for-each-ref refs/heads/ "--format=%(refname:short)" | while read -r branch; do
     mergeBase=$(git merge-base "$targetBranch" "$branch")
 
-    if [[ $(git cherry $targetBranch $(git commit-tree $(git rev-parse $branch\^{tree}) -p $mergeBase -m _)) == "-"* ]]; then
+    if [[ $(git cherry "$targetBranch" $(git commit-tree $(git rev-parse $branch\^{tree}) -p $mergeBase -m _)) == "-"* ]]; then
         git branch -D "$branch"
     fi
 done

bin/git-delete-tag

@@ -22,5 +22,5 @@ do
 done
 
 # Delete all the tags
-git tag -d $local_tags
-git push $origin $origin_refs
+git tag -d "$local_tags"
+git push "$origin" "$origin_refs"

bin/git-delta

@@ -12,4 +12,4 @@ else
   fi
 fi
 
-git diff --name-only --diff-filter=$filter $branch
+git diff --name-only --diff-filter="$filter" "$branch"

bin/git-gh-pages

@@ -4,10 +4,10 @@ echo 'setting up gh-pages'
 echo '-------------------'
 
 echo 'Tell me your github account username: '
-read username
+read -r username
 
 echo 'Now, tell me your repository name: '
-read repository
+read -r repository
 
 git stash \
 && git checkout -b 'gh-pages' \