chore: Improve quoting read invocations, and more

Author: hyperupcall

Diff for: git-addremove

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 git add -A
-git ls-files --deleted -z | while read file; do
+git ls-files --deleted -z | while read -r file; do
     git rm "$file"
 done

Diff for: git-addtree

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-git subtree add --prefix $1 ext/$(basename $1) master --squash
+git subtree add --prefix "$1" "ext/$(basename "$1")" master --squash

Diff for: git-all-commits

@@ -1,15 +1,15 @@
 #!/bin/sh
 
 find .git/objects -type f | \
-while read file; do
-    if echo $file | grep -Eq '\.idx$'; then
-        git show-index < $file | awk '{print $2}'
-    elif echo $file | grep -Eq '[0-9a-f]{38}$'; then
-        echo $(basename $(dirname $file))$(basename $file)
+while read -r file; do
+    if echo "$file" | grep -Eq '\.idx$'; then
+        git show-index < "$file" | awk '{print $2}'
+    elif echo "$file" | grep -Eq '[0-9a-f]{38}$'; then
+        echo "$(basename "$(dirname "$file")")$(basename "$file")"
     fi
 done | \
-while read hash; do
-    if [ "$(git cat-file -t $hash)" = commit ]; then
-        echo $hash
+while read -r hash; do
+    if [ "$(git cat-file -t "$hash")" = commit ]; then
+        echo "$hash"
     fi
 done

Diff for: git-all-objects

@@ -6,10 +6,10 @@ cd "$(git rev-parse --git-path objects)"
 
 # packed objects
 for p in pack/pack-*([0-9a-f]).idx ; do
-    git show-index < $p | cut -f 2 -d ' '
+    git show-index < "$p" | cut -f 2 -d ' '
 done
 
 # loose objects
 for o in [0-9a-f][0-9a-f]/*([0-9a-f]) ; do
-    echo ${o/\/}
+    echo "${o/\/}"
 done

Diff for: git-already-merged

@@ -4,5 +4,5 @@
 
 for branch in $(git branch -r --merged | grep -v HEAD)
 do
-    echo -e $(git show --format="%ci %cr %an" $branch | head -n 1) \\t$branch
+    printf '%s\t%s\n' "$(git show --format="%ci %cr %an" "$branch" | head -n 1)" "$branch"
 done | sort -r

Diff for: git-amend-all

@@ -6,15 +6,15 @@
 ## This is free software, and you are welcome to redistribute it
 ## under certain conditions; see COPYING for details.
 
-# Purpose: This script adds all modified and deleted files, 
+# Purpose: This script adds all modified and deleted files,
 # except the new files and adds it to the recent commit by amending it
 
 set -e
 
 # User is not in git repository
 if ! git branch > /dev/null 2>&1
 then
-	echo "E: '$(basename ${PWD})' - Not a Git repository."
+	echo "E: '$(basename "${PWD}")' - Not a Git repository."
 	exit 1
 fi
 

Diff for: git-apply-url

@@ -32,20 +32,20 @@
 URL=$1
 
 error() {
-  echo $*
+  echo "$*"
   exit 1
 }
 
-if [ ! $URL ]; then
-  error $0 URL
+if [ ! "$URL" ]; then
+  error "usage: $0 URL"
 fi
 
-if [ -x $(command -v curl) ] && [ $(curl -V | grep https) ]; then
+if command -v curl >/dev/null 2>&1 && curl -V | grep -q https >/dev/null 2>&1; then
   fetch="curl -s"
-elif [ -x $(command -v wget) ]; then
+elif command -v wget >/dev/null 2>&1; then
   fetch="wget -O - -q --no-check-certificate"
 else
   error need curl or wget
 fi
 
-$fetch $URL | patch -p1
+$fetch "$URL" | patch -p1

Diff for: git-branch-done

@@ -3,7 +3,7 @@
 
 # destination branch as parameter - depends on merge strategy, typically master
 DST_BRANCH=""
-if [ ! -z "$1" ]; then
+if [ -n "$1" ]; then
     DST_BRANCH="$1"
 else
 	echo "Usage: git branch-done <branch>"
@@ -13,4 +13,4 @@ fi
 # get  current branch - typically topic branch like taskXXXX, bugXXXX, ...
 cb=$(git rev-parse --abbrev-ref HEAD)
 # no fast forward merge from current branch to destination branch
-git checkout $DST_BRANCH && git merge --no-ff $cb && git branch -d $cb
+git checkout "$DST_BRANCH" && git merge --no-ff "$cb" && git branch -d "$cb"

Diff for: git-build

@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
 
 git clean -f -x -d
-git checkout $1
+git checkout "$1"
 
-rm -fr /usr/local/stow/git-$1
+rm -fr "/usr/local/stow/git-$1"
 
-make prefix=/usr/local/stow/git-$1 -j3 install
+make prefix="/usr/local/stow/git-$1" -j3 install
 
 git checkout origin/man
 
-rsync -av man1/ /usr/local/stow/git-$1/share/man/man1/
-rsync -av man5/ /usr/local/stow/git-$1/share/man/man5/
-rsync -av man7/ /usr/local/stow/git-$1/share/man/man7/
+rsync -av man1/ "/usr/local/stow/git-$1/share/man/man1/"
+rsync -av man5/ "/usr/local/stow/git-$1/share/man/man5/"
+rsync -av man7/ "/usr/local/stow/git-$1/share/man/man7/"
 
 git clean -f -x -d
 git checkout master
@@ -23,4 +23,4 @@ git merge origin/master
 cd /usr/local/stow
 stow -D git-*
 
-stow git-$1
+stow "git-$1"

Diff for: git-changebar

@@ -27,10 +27,10 @@ fi
 REV="$1"
 shift
 
-while ! [ -z "$1" ]
+while [ -n "$1" ]
 do
-   if grep 'tex[[:space:]]*$' >/dev/null <<@ 
-$1 
+   if grep 'tex[[:space:]]*$' >/dev/null <<@
+$1
 @
    then
       FILE="$1"
@@ -39,7 +39,7 @@ $1
 
       docstart=$(grep -n 'begin{document}' "$FILE" | cut -d: -f1)
 
-      for i in $(GIT_DIFF_OPTS=-u0 git diff "$REV" "$FILE" | 
+      for i in $(GIT_DIFF_OPTS=-u0 git diff "$REV" "$FILE" |
                 sed -n '/^@@/s/@@ -[0-9,]* +\([0-9,]*\).*/\1/p')
       do
          start=$(cut -d, -f1 <<@
@@ -52,7 +52,7 @@ $i
 $i
 @
             then
-               diff=$(cut -d, -f2 <<@ 
+               diff=$(cut -d, -f2 <<@
 $i
 @
 )

Diff for: git-checkout-branches

@@ -12,7 +12,7 @@ set -e
 # User is not in git repository
 if ! git branch > /dev/null 2>&1
 then
-	echo "E: '$(basename ${PWD})' - Not a Git repository."
+	echo "E: '$(basename "${PWD}")' - Not a Git repository."
 	exit 1
 fi
 

Diff for: git-children-of

@@ -5,6 +5,6 @@ branch=$2
 
 [ -z "$branch" ] && branch=HEAD
 
-git rev-list --children $branch --not $commit^@ \
+git rev-list --children "$branch" --not "$commit^@" \
    | awk "/^$commit/ { print \$2 }"
 

Diff for: git-clone.sh

@@ -5,28 +5,28 @@
 
 GIT=$(command -v git)
 
-if [ "x$1" = "x" -o "x$2" = "x" ];then
+if [ "$1" = "" -o "$2" = "" ];then
   echo "use: $0 <git_repository_to_clone> <directory>"
   exit 1
 fi
 
-if [ "x$GIT" = "x" ];then
+if [ "$GIT" = "" ];then
   echo "No git command found. install it"
 fi
 
 function clone {
 
-  $GIT clone -q $1 $2
+  $GIT clone -q "$1" "$2"
   res=$?
-  
+
   cd "$2"
-  
+
   $GIT pull --all
-  
+
   for remote in $($GIT branch -r | grep -v \>); do
-     $GIT branch --track ${remote#origin/} $remote;
+     $GIT branch --track "${remote#origin/}" "$remote";
   done
 }
 
 echo "cloning repository into ... $2"
-clone $1 "$2"
+clone "$1" "$2"

Diff for: git-closest-match

@@ -14,7 +14,7 @@ fi
 commit=$(for i in $all; do
 	printf '%s\n' "$i "
 	# why is there no git diff --shortnumstat ?
-	git diff -M "$spec" $i | wc -l
+	git diff -M "$spec" "$i" | wc -l
 done | sort -k 2 -n | head -n 1 | cut -f 1 -d ' ')
 if [ "$mode" = diff ]; then
 	git log --no-walk "$commit" | cat -

Diff for: git-smerge

@@ -3,35 +3,35 @@
 current=$(git symbolic-ref HEAD | sed 's%refs/heads/%%')
 branch=$1
 
-if ! git merge $branch; then
-    echo GIT-SMERGE: Simple merge with $branch failed, attempting rebase-merge
+if ! git merge "$branch"; then
+    echo "GIT-SMERGE: Simple merge with $branch failed, attempting rebase-merge"
 
     git reset --hard HEAD
     git checkout -b temp.$$
 
-    if git rebase $branch > /dev/null 2>&1; then
-        echo GIT-SMERGE: Rebase with $branch succeeded, using tree to create merge commit
+    if git rebase "$branch" > /dev/null 2>&1; then
+        echo "GIT-SMERGE: Rebase with $branch succeeded, using tree to create merge commit"
 
-        if ! git checkout $current; then
+        if ! git checkout "$current"; then
             echo GIT-SMERGE: Some strange problem occurred!
             git branch -D temp.$$
             exit 1
         fi
 
-        git merge $branch > /dev/null 2>&1 # this is sure to fail
+        git merge "$branch" > /dev/null 2>&1 # this is sure to fail
         git clean -fd
         git archive --format=tar temp.$$ | tar xf -
         git branch -D temp.$$
         git add .
         git add -A
-        git ls-files --deleted -z | xargs -0 git rm 
+        git ls-files --deleted -z | xargs -0 git rm
         git commit
     else
-        echo GIT-SMERGE: Rebase with $branch failed, returning to failed merge
+        echo "GIT-SMERGE: Rebase with $branch failed, returning to failed merge"
 
         git rebase --abort
-        git checkout -f $current
+        git checkout -f "$current"
         git branch -D temp.$$
-        git merge $branch > /dev/null 2>&1 # this is sure to fail
+        git merge "$branch" > /dev/null 2>&1 # this is sure to fail
     fi
 fi

Diff for: git-stale-branches

@@ -7,5 +7,5 @@ fi
 git fetch --all
 
 for r in $(git branch -r --format='%(refname)'); do
-    git branch --merged $r;
+    git branch --merged "$r";
 done | sort -u | grep -v '^\*' | xargs -r echo # git branch -D

Diff for: git-status-all

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-find . -name .git -type d | \
-while read path; do \
-(cd "$path/.."; echo $(dirname "$path") ; git status); \
-done
+find . -name .git -type d |
+    while read -r path; do
+        (
+            cd "$path/.." && dirname "$path" && git status
+        )
+    done

Diff for: git-sync

@@ -1,42 +1,42 @@
 #!/usr/bin/env bash
 
-DIRS="$@"
+DIRS="$*"
 if [[ -z "$DIRS" ]]; then
     DIRS="."
 fi
 
 find "$DIRS" \( -name .git -o -name '*.git' \) -type d | \
-    while read repo_dir
+    while read -r repo_dir
     do
 	if [[ -f "$repo_dir"/config ]]
 	then
 	    # If this is a git-svn repo, use git svn fetch
 	    if grep -q '^\[svn-remote ' "$repo_dir"/config
 	    then
-		echo git svn fetch: $repo_dir
+		echo "git svn fetch: $repo_dir"
 		GIT_DIR="$repo_dir" git svn fetch
 
 	    # If this is a gc-utils repo, use gc-utils update
 	    elif grep -q '^\[gc-utils\]' "$repo_dir"/config
 	    then
-		echo gc-utils update: $repo_dir
-		(cd "$repo_dir"; gc-utils update)
+		echo "gc-utils update: $repo_dir"
+		(cd "$repo_dir" && gc-utils update)
 
 	    else
 		for remote in $(GIT_DIR="$repo_dir" git remote)
 		do
 		    if [[ $remote != mirror ]]; then
-			echo git fetch: $repo_dir -- $remote
-			GIT_DIR="$repo_dir" git fetch $remote
+			echo "git fetch: $repo_dir -- $remote"
+			GIT_DIR="$repo_dir" git fetch "$remote"
 		    fi
 		done
 	    fi
 
 	    for remote in $(GIT_DIR="$repo_dir" git remote)
 	    do
 		if [[ $remote == mirror ]]; then
-		    echo git push: $repo_dir -- $remote
-		    GIT_DIR="$repo_dir" git push --mirror $remote
+		    echo "git push: $repo_dir -- $remote"
+		    GIT_DIR="$repo_dir" git push --mirror "$remote"
 		fi
 	    done
 	fi

Diff for: git-track-branch

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 branch_name=$1
-git checkout --track -b ${branch_name} origin/${branch_name}
+git checkout --track -b "${branch_name}" "origin/${branch_name}"

Diff for: git-undo

@@ -25,7 +25,7 @@ case $cmd in
         ;;
 
     pull|merge|rebase|am)
-        git reset --hard HEAD@{0}
+        git reset --hard "HEAD@{0}"
         ;;
 esac
 

Diff for: git-unpack

@@ -5,7 +5,7 @@ if [ -f .git/objects/pack/*.pack ]; then
   GIT_DIR=/tmp/tmpgit.$$ git init
 
   for pack in .git/objects/pack/*.pack; do
-    GIT_DIR=/tmp/tmpgit.$$ git unpack-objects < $pack
+    GIT_DIR=/tmp/tmpgit.$$ git unpack-objects < "$pack"
     if [ $? -ne 0 ]; then
       echo "Unpack of $pack failed, aborting"
       exit 1