Support both BSD and GNU ls commands (for OS X and Linux, respectively)

lib/git/shell_shortcuts.sh

@@ -49,13 +49,27 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
   _git_wrap_commands
 fi
 
-# Function wrapper around 'll'
+
-# Adds numbered shortcuts to output of ls -l, just like 'git status'
+# BSD ls is different to Linux (GNU) ls
-unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1
+_uname="$(uname)"
-function ll {
+if [ "$_uname" = "Linux" ]; then
+  # Linux ls commands
+  _ll_command="ls -l --group-directories-first --color"
+  _ll_sys_command="ls --color=never"
+elif [ "$_uname" = "Darwin" ]; then
+  # OS X ls commands
+  _ll_command="ls -l -G"
+  _ll_sys_command="ls"
+fi
+
+if [ -n "$_ll_command" ]; then
+  # Function wrapper around 'll'
+  # Adds numbered shortcuts to output of ls -l, just like 'git status'
+  unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1
+  function ll {
     # Use ruby to inject numbers into ls output
     ruby -e "$( cat <<EOF
-    output = %x(ls -lv --group-directories-first --color)
+  output = %x($_ll_command)
   output.lines.each_with_index do |line, i|
     puts line.sub(/^(([^ ]* +){8})/, "\\\1\e[2;37m[\e[0m#{i}\e[2;37m]\e[0m" << (i < 10 ? "  " : " "))
   end
@@ -64,9 +78,10 @@ EOF
 
     # Set numbered file shortcut in variable
     local e=1
-  for file in $(ls -v --group-directories-first --color=never); do
+    for file in $($_ll_sys_command); do
       export $git_env_char$e="$(readlink -f $file)"
       if [ "${scmbDebug:-}" = "true" ]; then echo "Set \$$git_env_char$e  => $file"; fi
       let e++
     done
-}
+  }
+fi