Merge pull request #428 from koenpunt/export-nvm-dir-in-profile

export NVM_DIR in profile before sourcing nvm.sh
master
Jordan Harband 2014-05-29 16:04:25 -07:00
commit 931cc45fc3
1 changed files with 4 additions and 6 deletions

View File

@ -101,7 +101,7 @@ if [ -z "$PROFILE" ]; then
fi fi
fi fi
SOURCE_STR="[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\" # This loads nvm" SOURCE_STR="\nexport NVM_DIR=\"$NVM_DIR\"\n[ -s \"\$NVM_DIR/nvm.sh\" ] && . \"\$NVM_DIR/nvm.sh\" # This loads nvm"
if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
if [ -z $PROFILE ]; then if [ -z $PROFILE ]; then
@ -112,15 +112,13 @@ if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
echo "=> Create it (touch $PROFILE) and run this script again" echo "=> Create it (touch $PROFILE) and run this script again"
fi fi
echo " OR" echo " OR"
echo "=> Append the following line to the correct file yourself:" echo "=> Append the following lines to the correct file yourself:"
echo echo -e "$SOURCE_STR"
echo " $SOURCE_STR"
echo echo
else else
if ! grep -qc 'nvm.sh' $PROFILE; then if ! grep -qc 'nvm.sh' $PROFILE; then
echo "=> Appending source string to $PROFILE" echo "=> Appending source string to $PROFILE"
echo "" >> "$PROFILE" echo -e "$SOURCE_STR" >> "$PROFILE"
echo $SOURCE_STR >> "$PROFILE"
else else
echo "=> Source string already in $PROFILE" echo "=> Source string already in $PROFILE"
fi fi