linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
Chen Houwu 2014-01-04 18:51:44 +08:00
commit 0e7f4af390
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugins/nodeenv/nodeenv-prompt.plugin.zsh
View file

@ -1,18 +0,0 @@
export NODE_VIRTUAL_ENV_DISABLE_PROMPT=1
ZSH_THEME_NODEENV_PROMPT_PREFIX="("
ZSH_THEME_NODEENV_PROMPT_SUFFIX=")"
function nodeenv_prompt_info() {
if [ -n "$NODE_VIRTUAL_ENV" ]; then
if [ "`basename "$NODE_VIRTUAL_ENV"`" = "__" ] ; then
# special case for Aspen magic directories
# see http://www.zetadev.com/software/aspen/
local name="[`basename \`dirname "$NODE_VIRTUAL_ENV"\``]"
else
local name=`basename "$NODE_VIRTUAL_ENV"`
fi
echo "$ZSH_THEME_NODEENV_PROMPT_PREFIX$name$ZSH_THEME_NODEENV_PROMPT_SUFFIX"
fi
}

20
plugins/nodeenv/nodeenv.plugin.zsh
View file

@ -20,7 +20,6 @@ if [[ ! $DISABLE_NODEENV_CD -eq 1 ]]; then
else
NODEENV_NAME=""
fi
source $NODEENV_NAME/bin/activate && export CD_NODEENV="$NODEENV_NAME"
if [[ "$NODEENV_NAME" != "" ]]; then
source $NODEENV_NAME/bin/activate && export CD_NODEENV="$NODEENV_NAME"
elif [ $CD_NODEENV ]; then
@ -44,3 +43,22 @@ if [[ ! $DISABLE_NODEENV_CD -eq 1 ]]; then
set -A chpwd_functions nodeenv_cwd
fi
fi
export NODE_VIRTUAL_ENV_DISABLE_PROMPT=1
ZSH_THEME_NODEENV_PROMPT_PREFIX="("
ZSH_THEME_NODEENV_PROMPT_SUFFIX=")"
function nodeenv_prompt_info() {
if [ -n "$NODE_VIRTUAL_ENV" ]; then
if [ "`basename "$NODE_VIRTUAL_ENV"`" = "__" ] ; then
# special case for Aspen magic directories
# see http://www.zetadev.com/software/aspen/
local name="[`basename \`dirname "$NODE_VIRTUAL_ENV"\``]"
else
local name=`basename "$NODE_VIRTUAL_ENV"`
fi
echo "$ZSH_THEME_NODEENV_PROMPT_PREFIX$name$ZSH_THEME_NODEENV_PROMPT_SUFFIX"
fi
}