Skip to content
Browse files

export/unset CLICOLOR_FORCE=1 var for ll command

  • Loading branch information...
1 parent 281131e commit adef82a838daeaf8df3ba8bf5b787f32e688a7de @ndbroadbent committed Oct 21, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 lib/git/shell_shortcuts.sh
View
5 lib/git/shell_shortcuts.sh
@@ -82,7 +82,7 @@ if [ "$_uname" = "Linux" ]; then
_abs_path_command="readlink -f"
elif [ "$_uname" = "Darwin" ]; then
# OS X ls commands
- _ll_command="CLICOLOR_FORCE=1 ls -l -G"
+ _ll_command="ls -l -G"
_ll_sys_command="ls"
# Use perl abs_path, since readlink -f isn't available on OS X
_abs_path_command="perl -e 'use Cwd \"abs_path\"; print abs_path(shift)'"
@@ -93,6 +93,8 @@ if [ -n "$_ll_command" ]; then
# 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 ls_with_file_shortcuts {
+ local OLDCLICOLOR_FORCE="$CLICOLOR_FORCE"
+ export CLICOLOR_FORCE=1
local ll_output="$($_ll_command "$@")"
# Parse path from args
@@ -146,6 +148,7 @@ EOF
let e++
done
IFS="$OLDIFS"
+ export CLICOLOR_FORCE="$OLDCLICOLOR_FORCE"
}
fi

0 comments on commit adef82a

Please sign in to comment.
Something went wrong with that request. Please try again.