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

Added debugging statements to _git_wrap_commands

Browse Source
This commit is contained in:
Nathan Broadbent
2012-08-21 14:14:32 +12:00
parent 75e9a909a5
commit fb68e6e470
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/git/shell_shortcuts.sh
View File

@@ -14,10 +14,19 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
type whence > /dev/null 2>&1 || function whence() { type "$@" | sed -e "s/.*is aliased to \`//" -e "s/'$//"; } type whence > /dev/null 2>&1 || function whence() { type "$@" | sed -e "s/.*is aliased to \`//" -e "s/'$//"; }
local cmd='' local cmd=''
for cmd in $scmb_wrapped_shell_commands; do for cmd in $scmb_wrapped_shell_commands; do
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: Wrapping $cmd..."; fi
case "$(type $cmd 2>&1)" in case "$(type $cmd 2>&1)" in
*'exec_scmb_expand_args'*|*'not found'*);; # Don't do anything if command not found, or already aliased.
# Don't do anything if command already aliased, or not found.
*'exec_scmb_expand_args'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is already wrapped"; fi;;
*'not found'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd not found!"; fi;;
*'is aliased to'*|*'is an alias for'*) *'is aliased to'*|*'is an alias for'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is an alias"; fi
# Store original alias # Store original alias
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
@@ -28,16 +37,21 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
alias $cmd="exec_scmb_expand_args $expanded_alias";; alias $cmd="exec_scmb_expand_args $expanded_alias";;
*'is a'*'function'*) *'is a'*'function'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a function"; fi
# Copy old function into new name # Copy old function into new name
eval "$(declare -f $cmd | sed "s/^$cmd ()/__original_$cmd ()/")" eval "$(declare -f $cmd | sed "s/^$cmd ()/__original_$cmd ()/")"
# Remove function # Remove function
unset -f $cmd unset -f $cmd
# Create wrapped alias for old function # Create wrapped alias for old function
alias "$cmd"="exec_scmb_expand_args __original_$cmd";; alias "$cmd"="exec_scmb_expand_args __original_$cmd";;
*'is a shell builtin'*) *'is a shell builtin'*)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a shell builtin"; fi
# Handle shell builtin commands # Handle shell builtin commands
alias $cmd="exec_scmb_expand_args builtin $cmd";; alias $cmd="exec_scmb_expand_args builtin $cmd";;
*) *)
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is an executable file"; fi
# Otherwise, command is a regular script or binary, # Otherwise, command is a regular script or binary,
# and the full path can be found from 'which' # and the full path can be found from 'which'
alias $cmd="exec_scmb_expand_args $(\which $cmd)";; alias $cmd="exec_scmb_expand_args $(\which $cmd)";;