From 92eb2a4231740821c8b88afe913ee4f145c298be Mon Sep 17 00:00:00 2001 From: Trae Robrock Date: Sat, 5 Nov 2011 11:07:35 -0700 Subject: [PATCH 1/2] Revert "fix completion for commands wrapped with bundler" This reverts commit 965e1cfefa41bd0419126d9321eecec4fcbbb0e3. --- plugins/bundler/bundler.plugin.zsh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh index 3c96b8da9..a3c3cc33c 100644 --- a/plugins/bundler/bundler.plugin.zsh +++ b/plugins/bundler/bundler.plugin.zsh @@ -37,10 +37,5 @@ _run-with-bundler() { ## Main program for cmd in $bundled_commands; do - eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}" - alias $cmd=bundled_$cmd - - if which _$cmd > /dev/null 2>&1; then - compdef _$cmd bundled_$cmd - fi + alias $cmd="_run-with-bundler $cmd" done From 85473f14b2240bd8d888b53764cb47cf365cb01e Mon Sep 17 00:00:00 2001 From: Trae Robrock Date: Tue, 8 Nov 2011 12:24:14 -0800 Subject: [PATCH 2/2] Fixing the rvm_prompt_info command, now it will not show empty parens if no rvm is currently being used --- lib/rvm.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/rvm.zsh b/lib/rvm.zsh index 597be1b33..dbfaf8796 100644 --- a/lib/rvm.zsh +++ b/lib/rvm.zsh @@ -1,6 +1,10 @@ # get the name of the branch we are on function rvm_prompt_info() { ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return + if [ -z $ruby_version ] + then + return + fi echo "($ruby_version)" }