Merge pull request jwiegley#48 from hyperupcall/improved-shebangs

jwiegley · web-flow · commit ee2c3869f508 · 2023-01-16T11:21:31.000-08:00
diff --git a/git-addsub b/git-addsub
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script makes it much easier to add new submodules
 
diff --git a/git-addtree b/git-addtree
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 git subtree add --prefix $1 ext/$(basename $1) master --squash
diff --git a/git-all-objects b/git-all-objects
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 shopt -s nullglob extglob
 
diff --git a/git-already-merged b/git-already-merged
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # From https://railsware.com/blog/git-housekeeping-tutorial-clean-up-outdated-branches-in-local-and-remote-repositories/
 
diff --git a/git-archive-all b/git-archive-all
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Super basic tool to export repo and all submodules
 # as a single zip file
diff --git a/git-branch-done b/git-branch-done
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # git branch-done <branch>
 
 # destination branch as parameter - depends on merge strategy, typically master
diff --git a/git-build b/git-build
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 git clean -f -x -d
 git checkout $1
diff --git a/git-changebar b/git-changebar
@@ -1,4 +1,4 @@
-#!/bin/sh --
+#!/bin/sh
 #
 # git-changebar
 #
diff --git a/git-children-of b/git-children-of
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 commit=$1
 branch=$2
diff --git a/git-clone.sh b/git-clone.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/usr/bin/env bash
 
 # this script clones a repository, including all its remote branches
 # Author: julianromera
diff --git a/git-cmpdir b/git-cmpdir
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 stat=false
 if [[ "$1" == "--stat" ]]; then
diff --git a/git-current b/git-current
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [[ -z "$1" ]]; then
     ancestor=master
diff --git a/git-current-branch b/git-current-branch
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 git rev-parse --abbrev-ref HEAD
diff --git a/git-diff-directory b/git-diff-directory
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 stat=true
 if [[ "$1" == "-p" ]]; then
diff --git a/git-discover-large-blobs b/git-discover-large-blobs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #set -x 
 
 # Shows you the largest objects in your repo's pack file.
diff --git a/git-each b/git-each
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 DIRS="."
 if [[ "$1" == --dir ]]; then
diff --git a/git-every b/git-every
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 exec find . -name .git -type d -exec git --git-dir="{}" "$@" \;
diff --git a/git-fetch-github b/git-fetch-github
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 REMOTE=${1:-origin}
 git config remote.${REMOTE}.fetch "+refs/pull/*:refs/remotes/${REMOTE}/pr/*"
diff --git a/git-find-children b/git-find-children
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [[ $# == 0 ]]; then
     echo usage: git find-children REFS...
diff --git a/git-find-fetch b/git-find-fetch
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # usage: git-find-fetch [--mirror] [--repack] DIRS...
 #
diff --git a/git-find-useful-dangling-trees b/git-find-useful-dangling-trees
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 depth=${1:-all} # 'all' or number of depth
 
 for i in $(git fsck --unreachable | grep -E 'tree|commit' | cut -d\  -f3)
diff --git a/git-fix-wt b/git-fix-wt
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 find . -name config -type f -print0 \
     | xargs -0 perl -i -ne 'print unless /worktree =/;'
diff --git a/git-fixws b/git-fixws
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # If you are using MacPorts, you'll need to install 'patchutils'
 
diff --git a/git-hunt-and-seek b/git-hunt-and-seek
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 for hash in $(grep ^commit | awk '{print $2}'); do
     git diff-directory $1 $hash
diff --git a/git-ignore-wizard b/git-ignore-wizard
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # take a file/directory as arg1, to be added to ignore rules.
 # the user selects which ignore rules using dmenu
 # in the .gitconfig case, we should probably allow the user to edit it,
diff --git a/git-interactive-merge b/git-interactive-merge
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if [ -z "$1" ] || [ -z "$2" ]
 then
 	echo "usage: $0 <from> <to>" >&2
diff --git a/git-link-upstream b/git-link-upstream
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 BRANCH=$(git-current-branch)
 
diff --git a/git-master b/git-master
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 git stash
 git co master
 git stash pop
diff --git a/git-merge-to b/git-merge-to
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # git merge-to <branch>
 
 # destination branch as parameter - depends on merge strategy, typically release
diff --git a/git-publish b/git-publish
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SERVER=$1
 PATHNAME=$2
diff --git a/git-pulltree b/git-pulltree
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 git subtree pull --prefix $1 ext/$(basename $1) master --squash
diff --git a/git-pushtree b/git-pushtree
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 git subtree push --prefix $1 fork/$(basename $1) master
diff --git a/git-rebase-master b/git-rebase-master
@@ -1,5 +1,5 @@
-#!/bin/bash -e
-
+#!/usr/bin/env bash
+set -e
 git checkout master
 git pull --ff-only
 git checkout -
diff --git a/git-rebranch b/git-rebranch
@@ -1,5 +1,5 @@
-#!/bin/bash -e
-
+#!/usr/bin/env bash
+set -e
 newbranch=$1
 remote=${2:-origin/master}
 
diff --git a/git-release b/git-release
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # git release <branch>
 
 # destination branch as parameter - depends on merge strategy, typically release
diff --git a/git-remote-in-sync.sh b/git-remote-in-sync.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # checks if the specified remote(s) are in sync with what we have
 # in other words: do we have anything which is not at the remote?
 # Any commit, tag, branch, dirty WC/index or stashed state?
diff --git a/git-remove-empty-commits b/git-remove-empty-commits
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 git filter-branch --commit-filter 'if [ z$1 = z`git rev-parse $3^{tree}` ]; then skip_commit "$@"; else git commit-tree "$@"; fi' "$@"
diff --git a/git-rm-conflicts b/git-rm-conflicts
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # git-rm-conflicts, version 1.3
 #
diff --git a/git-root b/git-root
@@ -1,7 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh
 # inspired by http://stackoverflow.com/questions/957928/is-there-a-way-to-get-to-the-git-root-directory-in-one-command/3009378#3009378
 # gives absolute path to git repository root, either for cwd, or directory (or files' dirname) given as $1
 # when not a git repository, exit >0
+set -e
 if [ -n "$1" ]
 then
 	if [ -d "$1" ]
diff --git a/git-save b/git-save
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # To be used with the git-save-* scripts @ https://github.com/jwiegley/git-scripts
 mypath=$(dirname $0)
diff --git a/git-signed-tag b/git-signed-tag
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 git tag -s -m "$1" $1 $2
diff --git a/git-smerge b/git-smerge
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 current=$(git symbolic-ref HEAD | sed 's%refs/heads/%%')
 branch=$1
diff --git a/git-stale-branches b/git-stale-branches
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if ! git config --get-all remote.origin.fetch | grep -q '/pr/'; then
     git config --add remote.origin.fetch '+refs/pull/*:refs/remotes/origin/pr/*'
diff --git a/git-sync b/git-sync
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 DIRS="$@"
 if [[ -z "$DIRS" ]]; then
diff --git a/git-tag-diff b/git-tag-diff
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Show the differences between local tags and ones on the remote, if any
 # (defaults to origin, but another remote may be specified on the commandline)
 
diff --git a/git-touch-repos b/git-touch-repos
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export GIT_DIR
 
diff --git a/git-trial-merge b/git-trial-merge
@@ -1,3 +1,4 @@
-#!/bin/sh -xe
+#!/bin/sh
+set -xe
 git checkout --detach HEAD
 git merge --no-edit -- "$@"
diff --git a/git-undo b/git-undo
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cmd=$1
 shift 1
diff --git a/git-working-tree b/git-working-tree
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Set contents of the working tree equal to TREEISH
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`
`3`	`3`	`# This script makes it much easier to add new submodules`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`git subtree add --prefix $1 ext/$(basename $1) master --squash`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh --`
	`1`	`+#!/bin/sh`
`2`	`2`	`#`
`3`	`3`	`# git-changebar`
`4`	`4`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`
`3`	`3`	`# this script clones a repository, including all its remote branches`
`4`	`4`	`# Author: julianromera`