Fix nvm dir path in install script, fix #1189

Peter Dave Hello 2016-08-05 15:23:09 +08:00 committed by GitHub
parent f9f140ec13
commit 88fc93a71b
1 changed files with 5 additions and 5 deletions

View File

@ -74,7 +74,7 @@ install_nvm_from_git() {
exit 1 exit 1
} }
else else
# Cloning to $NVM_DIR # Cloning to $INSTALL_DIR
echo "=> Downloading nvm from git to '$INSTALL_DIR'" echo "=> Downloading nvm from git to '$INSTALL_DIR'"
printf "\r=> " printf "\r=> "
mkdir -p "$INSTALL_DIR" mkdir -p "$INSTALL_DIR"
@ -137,12 +137,12 @@ install_nvm_as_script() {
echo >&2 "Failed to download '$NVM_SOURCE_LOCAL'" echo >&2 "Failed to download '$NVM_SOURCE_LOCAL'"
return 1 return 1
} }
nvm_download -s "$NVM_EXEC_SOURCE" -o "$NVM_DIR/nvm-exec" || { nvm_download -s "$NVM_EXEC_SOURCE" -o "$INSTALL_DIR/nvm-exec" || {
echo >&2 "Failed to download '$NVM_EXEC_SOURCE'" echo >&2 "Failed to download '$NVM_EXEC_SOURCE'"
return 2 return 2
} }
chmod a+x "$NVM_DIR/nvm-exec" || { chmod a+x "$INSTALL_DIR/nvm-exec" || {
echo >&2 "Failed to mark '$NVM_DIR/nvm-exec' as executable" echo >&2 "Failed to mark '$INSTALL_DIR/nvm-exec' as executable"
return 3 return 3
} }
} }
@ -290,7 +290,7 @@ nvm_do_install() {
fi fi
# Source nvm # Source nvm
. "$NVM_DIR/nvm.sh" . "$INSTALL_DIR/nvm.sh"
nvm_check_global_modules nvm_check_global_modules