ld/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-05-11 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

:make dash compatible/tests pass again

Browse Source
This commit is contained in:
Sander Hahn 2014-01-04 04:58:33 +01:00
parent 17daa68a35
commit a48aaa9624
4 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nvm.sh
View File

@ -21,14 +21,18 @@ fi
# Auto detect the NVM_DIR # Auto detect the NVM_DIR
if [ ! -d "$NVM_DIR" ]; then if [ ! -d "$NVM_DIR" ]; then
export NVM_DIR=$(cd $NVM_CD_FLAGS $(dirname ${BASH_SOURCE[0]:-$0}) > /dev/null && pwd) if [ -n "$BASH_SOURCE" ]; then
export NVM_DIR=$(cd $NVM_CD_FLAGS $(dirname ${BASH_SOURCE[0]:-$0}) > /dev/null && pwd)
else
export NVM_DIR=$HOME/.nvm
fi
fi fi
nvm_set_nullglob() { nvm_set_nullglob() {
if has "setopt"; then if has "setopt"; then
# Zsh # Zsh
setopt NULL_GLOB setopt NULL_GLOB
else elif has "shopt"; then
# Bash # Bash
shopt -s nullglob shopt -s nullglob
fi fi
@ -36,8 +40,8 @@ nvm_set_nullglob() {
# Obtain nvm version from rc file # Obtain nvm version from rc file
rc_nvm_version() { rc_nvm_version() {
if [ -e .nvmrc ]; then if [ -e ~/.nvmrc ]; then
RC_VERSION=`cat .nvmrc | head -n 1` RC_VERSION=`cat ~/.nvmrc | head -n 1`
echo "Found .nvmrc files with version <$RC_VERSION>" echo "Found .nvmrc files with version <$RC_VERSION>"
fi fi
} }
@ -81,7 +85,7 @@ nvm_ls() {
return return
fi fi
# If it looks like an explicit version, don't do anything funny # If it looks like an explicit version, don't do anything funny
if [[ "$PATTERN" == v?*.?*.?* ]]; then if [ `expr "$PATTERN" : "v.*.\?.*.\?.*$"` != 0 ]; then
VERSIONS="$PATTERN" VERSIONS="$PATTERN"
else else
VERSIONS=`find "$NVM_DIR/" -maxdepth 1 -type d -name "v$PATTERN*" -exec basename '{}' ';' \ VERSIONS=`find "$NVM_DIR/" -maxdepth 1 -type d -name "v$PATTERN*" -exec basename '{}' ';' \
@ -91,7 +95,7 @@ nvm_ls() {
echo "N/A" echo "N/A"
return return
fi fi
echo "$VERSIONS" printf "$VERSIONS\n"
return return
} }
@ -135,12 +139,12 @@ print_versions() {
local PADDED_VERSION='' local PADDED_VERSION=''
for VERSION in $1; do for VERSION in $1; do
PADDED_VERSION=`printf '%10s' $VERSION` PADDED_VERSION=`printf '%10s' $VERSION`
if [[ -d "$NVM_DIR/$VERSION" ]]; then if [ -d "$NVM_DIR/$VERSION" ]; then
PADDED_VERSION="\033[0;34m$PADDED_VERSION\033[0m" PADDED_VERSION="\033[0;34m$PADDED_VERSION\033[0m"
fi fi
OUTPUT="$OUTPUT\n$PADDED_VERSION" OUTPUT="$OUTPUT\n$PADDED_VERSION"
done done
echo -e "$OUTPUT" printf "$OUTPUT\n"
} }
nvm() { nvm() {
@ -317,10 +321,10 @@ nvm() {
nvm use $VERSION nvm use $VERSION
if ! has "npm" ; then if ! has "npm" ; then
echo "Installing npm..." echo "Installing npm..."
if [[ "`expr match $VERSION '\(^v0\.1\.\)'`" != '' ]]; then if [ "`expr match $VERSION '\(^v0\.1\.\)'`" != '' ]; then
echo "npm requires node v0.2.3 or higher" echo "npm requires node v0.2.3 or higher"
elif [[ "`expr match $VERSION '\(^v0\.2\.\)'`" != '' ]]; then elif [ "`expr match $VERSION '\(^v0\.2\.\)'`" != '' ]; then
if [[ "`expr match $VERSION '\(^v0\.2\.[0-2]$\)'`" != '' ]]; then if [ "`expr match $VERSION '\(^v0\.2\.[0-2]$\)'`" != '' ]; then
echo "npm requires node v0.2.3 or higher" echo "npm requires node v0.2.3 or higher"
else else
curl https://npmjs.org/install.sh | clean=yes npm_install=0.2.19 sh curl https://npmjs.org/install.sh | clean=yes npm_install=0.2.19 sh
@ -336,7 +340,7 @@ nvm() {
;; ;;
"uninstall" ) "uninstall" )
[ $# -ne 2 ] && nvm help && return [ $# -ne 2 ] && nvm help && return
if [[ $2 == `nvm_version` ]]; then if [ $2 == `nvm_version` ]; then
echo "nvm: Cannot uninstall currently-active node version, $2." echo "nvm: Cannot uninstall currently-active node version, $2."
return 1 return 1
fi fi
@ -364,14 +368,14 @@ nvm() {
;; ;;
"deactivate" ) "deactivate" )
if [[ $PATH == *$NVM_DIR/*/bin* ]]; then if [ `expr $PATH : ".*$NVM_DIR/.*/bin.*"` != 0 ] ; then
export PATH=${PATH%$NVM_DIR/*/bin*}${PATH#*$NVM_DIR/*/bin:} export PATH=${PATH%$NVM_DIR/*/bin*}${PATH#*$NVM_DIR/*/bin:}
hash -r hash -r
echo "$NVM_DIR/*/bin removed from \$PATH" echo "$NVM_DIR/*/bin removed from \$PATH"
else else
echo "Could not find $NVM_DIR/*/bin in \$PATH" echo "Could not find $NVM_DIR/*/bin in \$PATH"
fi fi
if [[ $MANPATH == *$NVM_DIR/*/share/man* ]]; then if [ `expr $MANPATH : ".*$NVM_DIR/.*/share/man.*"` != 0 ] ; then
export MANPATH=${MANPATH%$NVM_DIR/*/share/man*}${MANPATH#*$NVM_DIR/*/share/man:} export MANPATH=${MANPATH%$NVM_DIR/*/share/man*}${MANPATH#*$NVM_DIR/*/share/man:}
echo "$NVM_DIR/*/share/man removed from \$MANPATH" echo "$NVM_DIR/*/share/man removed from \$MANPATH"
else else
@ -402,7 +406,7 @@ nvm() {
echo "$VERSION version is not installed yet" echo "$VERSION version is not installed yet"
return 1 return 1
fi fi
if [[ $PATH == *$NVM_DIR/*/bin* ]]; then if [ `expr $PATH : ".*$NVM_DIR/.*/bin"` != 0 ]; then
PATH=${PATH%$NVM_DIR/*/bin*}$NVM_DIR/$VERSION/bin${PATH#*$NVM_DIR/*/bin} PATH=${PATH%$NVM_DIR/*/bin*}$NVM_DIR/$VERSION/bin${PATH#*$NVM_DIR/*/bin}
else else
PATH="$NVM_DIR/$VERSION/bin:$PATH" PATH="$NVM_DIR/$VERSION/bin:$PATH"
@ -411,7 +415,7 @@ nvm() {
MANPATH=$(manpath) MANPATH=$(manpath)
fi fi
MANPATH=${MANPATH#*$NVM_DIR/*/man:} MANPATH=${MANPATH#*$NVM_DIR/*/man:}
if [[ $MANPATH == *$NVM_DIR/*/share/man* ]]; 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
MANPATH="$NVM_DIR/$VERSION/share/man:$MANPATH" MANPATH="$NVM_DIR/$VERSION/share/man:$MANPATH"
@ -440,7 +444,7 @@ nvm() {
"ls" | "list" ) "ls" | "list" )
print_versions "`nvm_ls $2`" print_versions "`nvm_ls $2`"
if [ $# -eq 1 ]; then if [ $# -eq 1 ]; then
echo -ne "current: \t"; nvm_version current printf "current: \t"; nvm_version current
nvm alias nvm alias
fi fi
return return
@ -501,7 +505,7 @@ nvm() {
# declare local INSTALLS first, otherwise it doesn't work in zsh # declare local INSTALLS first, otherwise it doesn't work in zsh
local INSTALLS local INSTALLS
INSTALLS=( `nvm use $VERSION > /dev/null && npm -g -p ll | \grep "$ROOT\/[^/]\+$" | cut -d '/' -f $(($ROOTDEPTH + 2)) | cut -d ":" -f 2 | \grep -v npm | tr "\n" " "` ) INSTALLS=`nvm use $VERSION > /dev/null && npm -g -p ll | \grep "$ROOT\/[^/]\+$" | cut -d '/' -f $(($ROOTDEPTH + 2)) | cut -d ":" -f 2 | \grep -v npm | tr "\n" " "`
npm install -g ${INSTALLS[@]} npm install -g ${INSTALLS[@]}
;; ;;
@ -518,4 +522,4 @@ nvm() {
esac esac
} }
nvm ls default &>/dev/null && nvm use default >/dev/null || true nvm ls default >/dev/null && nvm use default >/dev/null || true

12
test/fast/Listing versions/Running "nvm ls" should display all installed versions.
View File

@ -2,13 +2,9 @@
. ../../../nvm.sh . ../../../nvm.sh
mkdir ../../../v0.0.{1,3,9} mkdir ../../../v0.1
mkdir ../../../v0.3.{1,3,9} mkdir ../../../v0.3
# The result should contain the version numbers. # The result should contain the version numbers.
nvm ls | grep v0.0.1 && nvm ls | grep v0.1 &&
nvm ls | grep v0.0.3 && nvm ls | grep v0.3
nvm ls | grep v0.0.9 &&
nvm ls | grep v0.3.1 &&
nvm ls | grep v0.3.3 &&
nvm ls | grep v0.3.9

2
test/fast/Running "nvm current" should display current nvm environment.
View File

@ -3,4 +3,4 @@
die () { echo $@ ; exit 1; } die () { echo $@ ; exit 1; }
. ../../nvm.sh . ../../nvm.sh
[[ $(nvm current) == *"current"* ]] || die "Failed to find current version" [ `expr "$(nvm current)" : ".*current"` != 0 ] || die "Failed to find current version"

6
test/fast/Running "nvm deactivate" should unset the nvm environment variables.
View File

@ -4,11 +4,11 @@ mkdir -p ../../v0.2.3
die () { echo $@ ; exit 1; } die () { echo $@ ; exit 1; }
[[ $PATH != *v0.2.3/*/bin* ]] || echo "WARNING: Unexpectedly found v0.2.3 already active" >&2 [ `expr $PATH : ".*v0.2.3/.*/bin"` == 0 ] || echo "WARNING: Unexpectedly found v0.2.3 already active" >&2
. ../../nvm.sh . ../../nvm.sh
nvm use v0.2.3 && nvm use v0.2.3 &&
[[ $PATH == *v0.2.3/*/bin* ]] || die "Failed to activate v0.2.3" [ `expr $PATH : ".*v0.2.3/.*/bin"` != 0 ] || die "Failed to activate v0.2.3"
nvm deactivate && nvm deactivate &&
[[ $PATH != *v0.2.3/*/bin* ]] || die "Failed to deactivate v0.2.3" [ `expr $PATH : ".*v0.2.3/.*/bin"` != 0 ] || die "Failed to deactivate v0.2.3"