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

Fixed shell command wrapping to always use the builtin or full path when wrapping an alias

Browse Source
This commit is contained in:
Nathan Broadbent
2012-08-23 10:00:13 +12:00
parent 760ca4eab7
commit e75041262e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/git/shell_shortcuts.sh
View File

@@ -31,9 +31,18 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
local original_alias="$(whence $cmd)" local original_alias="$(whence $cmd)"
# Remove alias, so that which can return binary # Remove alias, so that which can return binary
unalias $cmd unalias $cmd
# Detect original $cmd type, and escape
case "$(type $cmd 2>&1)" in
# Escape shell builtins with 'builtin'
*'is a shell builtin'*) local escaped_cmd="builtin $cmd";;
# Get full path for files with 'which'
*) local escaped_cmd="$(\which $cmd)";;
esac
# Expand original command into full path, to avoid infinite loops # Expand original command into full path, to avoid infinite loops
local expanded_alias="$(echo $original_alias | sed "s%^$cmd%$(\which $cmd)%")" local expanded_alias="$(echo $original_alias | sed "s%\(^\| \)$cmd\($\| \)%\\1$escaped_cmd\\2%")"
# Command is already an alias # Wrap previous alias with escaped command
alias $cmd="exec_scmb_expand_args $expanded_alias";; alias $cmd="exec_scmb_expand_args $expanded_alias";;
*'is a'*'function'*) *'is a'*'function'*)