mirror of
https://github.com/nvm-sh/nvm.git
synced 2025-05-12 15:11:50 +00:00
Merge ef3a43d6fa
into 29f582611b
This commit is contained in:
commit
66801996cb
2
nvm.sh
2
nvm.sh
@ -475,7 +475,7 @@ nvm() {
|
|||||||
if [ -z "$MANPATH" ]; then
|
if [ -z "$MANPATH" ]; then
|
||||||
MANPATH=$(manpath)
|
MANPATH=$(manpath)
|
||||||
fi
|
fi
|
||||||
MANPATH=${MANPATH#*$NVM_DIR/*/man:}
|
MANPATH=${MANPATH%$NVM_DIR/*/share/man*}${MANPATH#*$NVM_DIR/*/share/man:}
|
||||||
if [ `expr "$MANPATH" : ".*$NVM_DIR/.*/share/man"` != 0 ]; then
|
if [ `expr "$MANPATH" : ".*$NVM_DIR/.*/share/man"` != 0 ]; then
|
||||||
MANPATH=${MANPATH%$NVM_DIR/*/share/man*}$NVM_DIR/$VERSION/share/man${MANPATH#*$NVM_DIR/*/share/man}
|
MANPATH=${MANPATH%$NVM_DIR/*/share/man*}$NVM_DIR/$VERSION/share/man${MANPATH#*$NVM_DIR/*/share/man}
|
||||||
else
|
else
|
||||||
|
19
test/fast/Sourcing nvm.sh should set MANPATH correctly.
Executable file
19
test/fast/Sourcing nvm.sh should set MANPATH correctly.
Executable file
@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
mkdir -p ../../v0.10.26/share/man
|
||||||
|
echo v0.10.26 >../../alias/default
|
||||||
|
|
||||||
|
T_NVM_DIR=$(pwd)
|
||||||
|
T_NVM_DIR=${T_NVM_DIR%/test/fast}
|
||||||
|
echo $T_NVM_DIR
|
||||||
|
|
||||||
|
T_MANPATH=`manpath`
|
||||||
|
T_NVM_DIR=`echo $T_NVM_DIR | sed 's/\//\\\\\//g'`
|
||||||
|
T_MANPATH=`echo ${T_MANPATH} | awk -v RS=: -v ORS=: "/${T_NVM_DIR}/ "'{next} {print}' | sed 's/:*$//'`
|
||||||
|
echo $T_MANPATH
|
||||||
|
|
||||||
|
. ../../nvm.sh
|
||||||
|
echo $MANPATH
|
||||||
|
echo ${MANPATH#*$NVM_DIR/*/man:}
|
||||||
|
|
||||||
|
#The nvm entry should be the first one of MANPATH and remain other entries exist.
|
||||||
|
[ `expr "$MANPATH" : ".*$NVM_DIR/.*/share/man"` != 0 ] && [ "${MANPATH#*$NVM_DIR/*/man:}" = "${T_MANPATH}" ]
|
Loading…
Reference in New Issue
Block a user