273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that a system has `manpath` before invoking it. 

Closes #531, fixes #557.
master
Jordan Harband 2014-11-02 13:54:54 -08:00
parent 4b6075e29b
commit d09b84de3c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nvm.sh
View File

@ -836,6 +836,7 @@ nvm() {
PATH=`nvm_strip_path "$PATH" "/bin"` PATH=`nvm_strip_path "$PATH" "/bin"`
# Prepend current version # Prepend current version
PATH=`nvm_prepend_path "$PATH" "$NVM_VERSION_DIR/bin"` PATH=`nvm_prepend_path "$PATH" "$NVM_VERSION_DIR/bin"`
if nvm_has manpath; then
if [ -z "$MANPATH" ]; then if [ -z "$MANPATH" ]; then
MANPATH=$(manpath) MANPATH=$(manpath)
fi fi
@ -843,13 +844,14 @@ nvm() {
MANPATH=`nvm_strip_path "$MANPATH" "/share/man"` MANPATH=`nvm_strip_path "$MANPATH" "/share/man"`
# Prepend current version # Prepend current version
MANPATH=`nvm_prepend_path "$MANPATH" "$NVM_VERSION_DIR/share/man"` MANPATH=`nvm_prepend_path "$MANPATH" "$NVM_VERSION_DIR/share/man"`
export MANPATH
fi
# Strip other version from NODE_PATH # Strip other version from NODE_PATH
NODE_PATH=`nvm_strip_path "$NODE_PATH" "/lib/node_modules"` NODE_PATH=`nvm_strip_path "$NODE_PATH" "/lib/node_modules"`
# Prepend current version # Prepend current version
NODE_PATH=`nvm_prepend_path "$NODE_PATH" "$NVM_VERSION_DIR/lib/node_modules"` NODE_PATH=`nvm_prepend_path "$NODE_PATH" "$NVM_VERSION_DIR/lib/node_modules"`
export PATH export PATH
hash -r hash -r
export MANPATH
export NODE_PATH export NODE_PATH
export NVM_PATH="$NVM_VERSION_DIR/lib/node" export NVM_PATH="$NVM_VERSION_DIR/lib/node"
export NVM_BIN="$NVM_VERSION_DIR/bin" export NVM_BIN="$NVM_VERSION_DIR/bin"