@@ -1,15 +1,32 @@

 #!/bin/sh

 set -euC

-# Where `diff-highlight` is located and whether it's executable varies between

-# distros, so try a few common places and run the shebang manually.

+# Distros (or upstream git, I'm not sure) make it very annoying to actually use

+# the shipped `diff-highlight`. The following things vary depending on distro

+# and version:

+# - Where it is located

+# - If it has a file extension

+# - Whether it's executable

+# - Whether has a shebang

+# Therefore, we are left with this shim which does its best to actually run the

+# thing.

 for file in \

-  '/usr/share/doc/git/contrib/diff-highlight/diff-highlight' \

-  '/usr/share/git-core/contrib/diff-highlight' \

-  '/usr/share/git/diff-highlight/diff-highlight'

+  '/usr/share/doc/git/contrib/diff-highlight/diff-highlight'* \

+  '/usr/share/git-core/contrib/diff-highlight'* \

+  '/usr/share/git/diff-highlight/diff-highlight'*

 do

-  [ -e "$file" ] && break

+  # Does it exist?

+  [ -r "$file" ] || continue

+  # Is it executable?

+  [ -x "$file" ] && exec "$file" || true

+  # Does it have a shebang?

+  interp="$(sed -n '1s/^#!//p' "$file")"

+  [ "$interp" ] && exec $interp "$file" "$@" || true

+  # Does it have a file extension which matches a command?

+  ext="${file##*.}"

+  [ "$(command -v "$ext")" ] && exec "$ext" "$file" "$@" || true

 done

-prog="$(sed -n '1s/^#!//p' "$file")"

-exec $prog "$file" "$@"

+

+# Fallback.

+exec cat

new file mode 100755

@@ -0,0 +1,15 @@

+#!/bin/sh

+set -euC

+

+# Where `diff-highlight` is located and whether it's executable varies between

+# distros, so try a few common places and run the shebang manually.

+

+for file in \

+  '/usr/share/doc/git/contrib/diff-highlight/diff-highlight' \

+  '/usr/share/git-core/contrib/diff-highlight' \

+  '/usr/share/git/diff-highlight/diff-highlight'

+do

+  [ -e "$file" ] && break

+done

+prog="$(sed -n '1s/^#!//p' "$file")"

+exec $prog "$file" "$@"