Merge branch 'master' into improved-shebangs

Author: jwiegley

git-all-commits

@@ -2,9 +2,9 @@
 
 find .git/objects -type f | \
 while read file; do
- if echo $file | egrep -q '\.idx$'; then
+ if echo $file | grep -Eq '\.idx$'; then
  git show-index < $file | awk '{print $2}'
- elif echo $file | egrep -q '[0-9a-f]{38}$'; then
+ elif echo $file | grep -Eq '[0-9a-f]{38}$'; then
  echo $(basename $(dirname $file))$(basename $file)
  fi
 done | \

git-all-objects

@@ -2,7 +2,7 @@
 set -e
 shopt -s nullglob extglob
 
-cd "`git rev-parse --git-path objects`"
+cd "$(git rev-parse --git-path objects)"
 
 # packed objects
 for p in pack/pack-*([0-9a-f]).idx ; do

git-apply-url

@@ -40,9 +40,9 @@ if [ ! $URL ]; then
  error $0 URL
 fi
 
-if [[ -x $(which curl) && $(curl -V | grep https) ]]; then
+if [ -x $(command -v curl) ] && [ $(curl -V | grep https) ]; then
  fetch="curl -s"
-elif [[ -x $(which wget) ]]; then
+elif [ -x $(command -v wget) ]; then
  fetch="wget -O - -q --no-check-certificate"
 else
  error need curl or wget

git-branch-done

@@ -11,6 +11,6 @@ else
 fi
 
 # get current branch - typically topic branch like taskXXXX, bugXXXX, ...
-cb=`git rev-parse --abbrev-ref HEAD`
+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-changebar

@@ -37,25 +37,25 @@ $1
  OUT="${FILE%.tex}.diff.tex"
  cp "$FILE" "$OUT"
 
- docstart=`grep -n 'begin{document}' "$FILE" | cut -d: -f1`
+ docstart=$(grep -n 'begin{document}' "$FILE" | cut -d: -f1)
 
- for i in `GIT_DIFF_OPTS=-u0 git diff "$REV" "$FILE" | 
- sed -n '/^@@/s/@@ -[0-9,]* +\([0-9,]*\).*/\1/p'`
+ 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 <<@
+ start=$(cut -d, -f1 <<@
 $i
 @
-`
+)
  if [ "$start" -gt "$docstart" ]
  then
  if grep ',' >/dev/null <<@
 $i
 @
  then
- diff=`cut -d, -f2 <<@ 
+ diff=$(cut -d, -f2 <<@ 
 $i
 @
-`
+)
  else
  diff=0
  fi

git-clone.sh

@@ -3,7 +3,7 @@
 # this script clones a repository, including all its remote branches
 # Author: julianromera
 
-GIT=`which git`
+GIT=$(command -v git)
 
 if [ "x$1" = "x" -o "x$2" = "x" ];then
  echo "use: $0 <git_repository_to_clone> <directory>"
@@ -23,7 +23,7 @@ function clone {
 
  $GIT pull --all
 
- for remote in `$GIT branch -r | grep -v \>`; do
+ for remote in $($GIT branch -r | grep -v \>); do
  $GIT branch --track ${remote#origin/} $remote;
  done
 }

git-closest-match

@@ -6,16 +6,16 @@ spec=$1
 mode=${2:-diff} # num: number of lines or diff: actual diff/log message?
 range=${3:-30} # 'all' or most recent <num> in current branch?. 'all' can be quite slow
 if [ "$range" = 'all' ]; then
-all=`git rev-list --all | awk '/^commit/ {print $NF}'`
+all=$(git rev-list --all | awk '/^commit/ {print $NF}')
 else
-all=`git log -n $range | awk '/^commit/ {print $NF}'`
+all=$(git log -n $range | awk '/^commit/ {print $NF}')
 fi
 
-commit=`for i in $all; do
+commit=$(for i in $all; do
 printf '%s\n' "$i "
 # why is there no git diff --shortnumstat ?
 git diff -M $spec $i | wc -l
-done | sort -k 2 -n | head -n 1 | cut -f 1 -d ' '`
+done | sort -k 2 -n | head -n 1 | cut -f 1 -d ' ')
 if [ "$mode" = diff ]; then
 git log --no-walk $commit | cat -
 git diff -M $spec $commit | cat -

git-filemerge

@@ -1,22 +1,22 @@
 #!/bin/sh
 if test $# = 0; then
-OLD=`git write-tree`
+OLD=$(git write-tree)
 elif test "$1" = --cached; then
 OLD=HEAD
- NEW=`git write-tree`
+ NEW=$(git write-tree)
  shift
 fi
 if test $# -gt 0; then
 OLD="$1"; shift
 fi
 test $# -gt 0 && test -z "$CACHED" && NEW="$1"
-TMPDIR1=`mktemp -d`
+TMPDIR1=$(mktemp -d)
 git archive --format=tar $OLD | (cd "$TMPDIR1"; tar xf -)
 if test -z "$NEW"; then
 TMPDIR2=$(git rev-parse --show-cdup)
 test -z "$cdup" && TMPDIR2=.
 else
-TMPDIR2=`mktemp -d`
+TMPDIR2=$(mktemp -d)
  git archive --format=tar $NEW | (cd "$TMPDIR2"; tar xf -)
 fi
 

git-find-useful-dangling-trees

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 depth=${1:-all} # 'all' or number of depth
 
-for i in $(git fsck --unreachable | egrep 'tree|commit' | cut -d\  -f3)
+for i in $(git fsck --unreachable | grep -E 'tree|commit' | cut -d\  -f3)
 do
 echo -n "U:$i CM:"
 git-closest-match $i num $depth

git-ignore-wizard

@@ -12,20 +12,20 @@ then
 exit 2
 fi
 
-type=`echo \
+type=$(echo \
 ".gitignore-root # files all developers of this repo will want to exclude, in one central location
 .gitignore-dirname # same, but ignore file in parent directory, so you can have multiple .gitignore files
 exclude # specific to it's repo, but irrelevant to other devs
 .gitconfig # patterns you want to ignore, independent of the repository
-" | dmenu | cut -d ' ' -f1`
+" | dmenu | cut -d ' ' -f1)
 
 [ -z "$type" ] && echo 'Cancelled' && exit 0
 
-dirname=` dirname $file`
-basename=`basename $file`
+dirname=$( dirname $file)
+basename=$(basename $file)
 case $type in
 .gitignore-root)
-root=`git root $file` || exit 2
+root=$(git root $file) || exit 2
 dirname=$(readlink -f $dirname)
 relative_dir=$(echo $dirname | sed "s#^$root##") # ie: /src
 echo "$relative_dir/$basename" >> $root/.gitignore
@@ -35,7 +35,7 @@ case $type in
 echo "$basename" >> $dirname/.gitignore
 ;;
 exclude)
-root=`git root $file` || exit 2
+root=$(git root $file) || exit 2
 dirname=$(readlink -f $dirname)
 relative_dir=$(echo $dirname | sed "s#^$root##")
 echo "$relative_dir/$basename" >> $root/info/exclude