From 88fc93a71bf54c811ec0dc5c6d54dc001d883a66 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 5 Aug 2016 15:23:09 +0800 Subject: [PATCH] Fix nvm dir path in install script, fix #1189 --- install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index a443517..74c1f3e 100755 --- a/install.sh +++ b/install.sh @@ -74,7 +74,7 @@ install_nvm_from_git() { exit 1 } else - # Cloning to $NVM_DIR + # Cloning to $INSTALL_DIR echo "=> Downloading nvm from git to '$INSTALL_DIR'" printf "\r=> " mkdir -p "$INSTALL_DIR" @@ -137,12 +137,12 @@ install_nvm_as_script() { echo >&2 "Failed to download '$NVM_SOURCE_LOCAL'" 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'" return 2 } - chmod a+x "$NVM_DIR/nvm-exec" || { - echo >&2 "Failed to mark '$NVM_DIR/nvm-exec' as executable" + chmod a+x "$INSTALL_DIR/nvm-exec" || { + echo >&2 "Failed to mark '$INSTALL_DIR/nvm-exec' as executable" return 3 } } @@ -290,7 +290,7 @@ nvm_do_install() { fi # Source nvm - . "$NVM_DIR/nvm.sh" + . "$INSTALL_DIR/nvm.sh" nvm_check_global_modules