Merge pull request #52 from hyperupcall/improve-shell

Author: jwiegley

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

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

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

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

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

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
 

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

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"

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"

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
 @
 )