From 03092cf7aeadfecc85c02703d0d90862519dd5e1 Mon Sep 17 00:00:00 2001 From: Randall Hunt Date: Mon, 6 Aug 2012 12:27:25 -0400 Subject: [PATCH] fixed paths for virtualenv --- plugins/git/git.plugin.zsh | 4 ++-- plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index d3d3f702a..e08f4fc7f 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -61,9 +61,9 @@ function current_repository() { } # these aliases take advantage of the previous function -alias ggpull='git pull origin $(current_branch)' +alias ggpull='git pull origin --rebase $(current_branch)' compdef ggpull=git alias ggpush='git push origin $(current_branch)' compdef ggpush=git -alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' +alias ggpnp='git pull origin --rebase $(current_branch) && git push origin $(current_branch)' compdef ggpnp=git diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 5d0860400..5c35baf44 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -1,5 +1,5 @@ WRAPPER_FOUND=0 -for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do +for wrapsource in "/usr/local/share/python/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper"; do if [[ -e $wrapsource ]] ; then WRAPPER_FOUND=1 source $wrapsource