From 117feb8978f2608ce874b1ff6c93fdeda2d576d4 Mon Sep 17 00:00:00 2001 From: Chen Houwu Date: Sat, 4 Jan 2014 20:08:30 +0800 Subject: [PATCH] fix --- plugins/nodeenv/nodeenv.plugin.zsh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/nodeenv/nodeenv.plugin.zsh b/plugins/nodeenv/nodeenv.plugin.zsh index 169237fd5..6c884e98a 100644 --- a/plugins/nodeenv/nodeenv.plugin.zsh +++ b/plugins/nodeenv/nodeenv.plugin.zsh @@ -1,3 +1,4 @@ +#------activate/deactivate automatically-------------- if [[ ! $DISABLE_NODEENV_CD -eq 1 ]]; then # Automatically activate Git projects's virtual environments based on the # directory name of the project. Virtual environment name can be overridden @@ -11,16 +12,12 @@ if [[ ! $DISABLE_NODEENV_CD -eq 1 ]]; then NODEENV_PROJECT_ROOT="." fi # Check for virtualenv name override - if [[ -f "$NODEENV_PROJECT_ROOT/.nodeenv" ]]; then - NODEENV_NAME=`cat "$NODEENV_PROJECT_ROOT/.nodeenv"` - elif [[ -f "$NODEENV_PROJECT_ROOT/.nodeenv/bin/activate" ]];then + if [[ -f "$NODEENV_PROJECT_ROOT/.nodeenv/bin/activate" ]];then NODEENV_NAME="$NODEENV_PROJECT_ROOT/.nodeenv" - elif [[ "$NODEENV_PROJECT_ROOT" != "." ]]; then - NODEENV_NAME=`basename "$NODEENV_PROJECT_ROOT"` else NODEENV_NAME="" fi - if [[ "$NODEENV_NAME" != "" ]]; then + if [[ $NODEENV_NAME != "" ]]; then source $NODEENV_NAME/bin/activate && export CD_NODEENV="$NODEENV_NAME" elif [ $CD_NODEENV ]; then # We've just left the repo, deactivate the environment @@ -44,6 +41,7 @@ if [[ ! $DISABLE_NODEENV_CD -eq 1 ]]; then fi fi +#---------prompt------------------- export NODE_VIRTUAL_ENV_DISABLE_PROMPT=1 ZSH_THEME_NODEENV_PROMPT_PREFIX="("