flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://github.com/g5pw/scm_breeze into g5pw-master

Browse Source 
Conflicts:
	lib/git/shell_shortcuts.sh
This commit is contained in:
Nathan Broadbent
2012-10-23 10:22:49 +13:00
parent 0f36491613 905bd3d094
commit 647e18e3ef
1 changed files with 81 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/git/shell_shortcuts.sh
View File

@@ -74,31 +74,33 @@ fi
# BSD ls is different to Linux (GNU) ls # BSD ls is different to Linux (GNU) ls
_uname="$(uname)" # Test for BSD ls
if [ "$_uname" = "Linux" ]; then if ! ls --color=auto > /dev/null 2>&1; then
# Linux ls commands # ls is BSD
_ll_command="ls -lhv --group-directories-first --color" _ls_bsd="BSD"
_ll_sys_command="ls -v --group-directories-first --color=never" fi
_abs_path_command="readlink -f"
elif [ "$_uname" = "Darwin" ]; then # Test if readlink supports -f option, otherwise use perl (a bit slower)
# OS X ls commands if ! readlink -f > /dev/null 2>&1; then
_ll_command="CLICOLOR_FORCE=1 ls -l -G" _abs_path_command='perl -e "use Cwd "abs_path"; print abs_path(shift)"'
_ll_sys_command="ls" else
# Use perl abs_path, since readlink -f isn't available on OS X _abs_path_command="readlink -f"
_abs_path_command="perl -e 'use Cwd \"abs_path\"; print abs_path(shift)'"
fi fi
if [ -n "$_ll_command" ]; then
# Function wrapper around 'll' # Function wrapper around 'll'
# Adds numbered shortcuts to output of ls -l, just like 'git status' # 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 unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1
function ls_with_file_shortcuts { function ls_with_file_shortcuts {
# Wrap each arg in quotes local ll_output=''
local wrapped_args
for arg in "$@"; do wrapped_args+=" \"$arg\""; done if [ -z $_ls_bsd ]; then
local ll_output="$(eval $_ll_command $wrapped_args)" ll_output="$(ls -lhv --group-directories-first --color "$@")"
else
ll_output="$(CLICOLOR_FORCE=1 ls -l -G "$@")"
fi
# Parse path from args # Parse path from args
zsh_compat # Ensure sh_word_split is on
OLDIFS="$IFS"; IFS=$'\n' OLDIFS="$IFS"; IFS=$'\n'
for arg in $@; do for arg in $@; do
if [ -d "$arg" ]; then local rel_path="${arg%/}"; fi if [ -d "$arg" ]; then local rel_path="${arg%/}"; fi
@@ -139,10 +141,21 @@ EOF
# Set numbered file shortcut in variable # Set numbered file shortcut in variable
local e=1 local e=1
local ll_files="$(eval $_ll_sys_command $wrapped_args)" local ll_files=''
local file=''
if [ -z $_ls_bsd ]; then
ll_files="$(ls -v --group-directories-first --color=never "$@")"
else
ll_files="$(ls "$@")"
fi
OLDIFS="$IFS"; IFS=$'\n' OLDIFS="$IFS"; IFS=$'\n'
if [[ $shell == "zsh" ]]; then setopt shwordsplit; fi if [[ $shell == "zsh" ]]; then
# Ensure sh_word_split is on
zsh_compat
setopt shwordsplit
fi
for file in $ll_files; do for file in $ll_files; do
if [ -n "$rel_path" ]; then file="$rel_path/$file"; fi if [ -n "$rel_path" ]; then file="$rel_path/$file"; fi
export $git_env_char$e="$(eval $_abs_path_command \"$file\")" export $git_env_char$e="$(eval $_abs_path_command \"$file\")"
@@ -152,7 +165,6 @@ EOF
IFS="$OLDIFS" IFS="$OLDIFS"
if [[ $shell == "zsh" ]]; then unsetopt shwordsplit; fi if [[ $shell == "zsh" ]]; then unsetopt shwordsplit; fi
} }
fi
# Setup aliases # Setup aliases
alias ll="exec_scmb_expand_args ls_with_file_shortcuts" alias ll="exec_scmb_expand_args ls_with_file_shortcuts"