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

use a subshell instead of setting the START var 

also don't try to install npm if node installation fails.
master
Scott Bronson 2011-02-13 21:06:13 -08:00 committed by Tim Caswell
parent 8e0406e95b
commit d13d6b199a
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nvm.sh
View File

@ -36,21 +36,25 @@ nvm()
nvm help nvm help
return; return;
fi fi
START=`pwd` if (
mkdir -p "$NVM_DIR/src" && \ mkdir -p "$NVM_DIR/src" &&
cd "$NVM_DIR/src" && \ cd "$NVM_DIR/src" && \
wget "http://nodejs.org/dist/node-$2.tar.gz" -N && \ wget "http://nodejs.org/dist/node-$2.tar.gz" -N && \
tar -xzf "node-$2.tar.gz" && \ tar -xzf "node-$2.tar.gz" && \
cd "node-$2" && \ cd "node-$2" && \
./configure --prefix="$NVM_DIR/$2" && \ ./configure --prefix="$NVM_DIR/$2" && \
make && \ make && \
make install && \ make install
)
then
nvm use $2 nvm use $2
if ! which npm ; then if ! which npm ; then
echo "Installing npm..." echo "Installing npm..."
curl http://npmjs.org/install.sh | sh curl http://npmjs.org/install.sh | sh
fi fi
cd $START else
echo "nvm: install $2 failed!"
fi
;; ;;
"deactivate" ) "deactivate" )
if [[ $PATH == *$NVM_DIR/*/bin* ]]; then if [[ $PATH == *$NVM_DIR/*/bin* ]]; then