Re-wrap functions as functions. Fixes issue with RVM reload (cd wrapp…

…er will be overwritten without error)
scmbreeze · Jan 30, 2013 · dd10be7 · dd10be7
1 parent 3692db6
commit dd10be7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/git/shell_shortcuts.sh b/lib/git/shell_shortcuts.sh
@@ -60,8 +60,8 @@ if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_e
         eval "$(declare -f $cmd | sed -E "s/^$cmd \(\)/__original_$cmd ()/")"
         # Remove function
         unset -f $cmd
-        # Create wrapped alias for old function
-        alias "$cmd"="exec_scmb_expand_args __original_$cmd";;
+        # Create function that wraps old function
+        eval "${cmd}(){ exec_scmb_expand_args __original_${cmd} \"\$@\"; }";;
 
       *'is a shell builtin'*)
         if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a shell builtin"; fi

diff --git a/test/lib/git/shell_shortcuts_test.sh b/test/lib/git/shell_shortcuts_test.sh
@@ -63,7 +63,8 @@ test_shell_command_wrapping() {
   assertAliasEquals "exec_scmb_expand_args /bin/sed"          "sed"
   assertAliasEquals "exec_scmb_expand_args /bin/cat"          "cat"
   assertAliasEquals "exec_scmb_expand_args builtin cd"        "cd"
-  assertAliasEquals "exec_scmb_expand_args __original_ln"     "ln"
+  assertIncludes    "$(declare -f ln)" "ln ()"
+  assertIncludes    "$(declare -f ln)" "exec_scmb_expand_args __original_ln"
 }
 
 test_ls_with_file_shortcuts() {