diff --git a/README.markdown b/README.markdown index d72720c..274ffea 100644 --- a/README.markdown +++ b/README.markdown @@ -19,7 +19,7 @@ Often I also put in a line to use a specific version of node. ## Usage -To download, compile, and install the v0.2.5 release of node do this: +To download, compile, and install the v0.2.5 release of node, do this: nvm install v0.2.5 diff --git a/install.sh b/install.sh index 8ad7d20..d5a66cd 100755 --- a/install.sh +++ b/install.sh @@ -9,9 +9,7 @@ if [ "x$has" != "x" ]; then fi cat <>~/.bashrc # ADDED BY npm FOR NVM -NVM_DIR=$dir -. \$NVM_DIR/nvm.sh -nvm use +. $dir/nvm.sh # END ADDED BY npm FOR NVM NVM_CODE diff --git a/nvm.sh b/nvm.sh index 9abec5a..58646f3 100644 --- a/nvm.sh +++ b/nvm.sh @@ -46,8 +46,10 @@ nvm() make && \ make install && \ nvm use $2 - echo "Installing NPM..." - curl http://npmjs.org/install.sh | sh + if ! which npm ; then + echo "Installing npm..." + curl http://npmjs.org/install.sh | sh + fi cd $START ;; "deactivate" )