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

[Fix] `install.sh`: only un-interpolate $HOME for the profile source string. 

Fixes #1384.
Jordan Harband 2017-02-12 00:32:49 -08:00
parent affcc5087c
commit 6fc0241c21
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install.sh
View File

@ -7,7 +7,7 @@ nvm_has() {
} }
nvm_install_dir() { nvm_install_dir() {
printf %s "${NVM_DIR:-"$HOME/.nvm"}" | sed "s:^$HOME:\$HOME:" printf %s "${NVM_DIR:-"$HOME/.nvm"}"
} }
nvm_latest_version() { nvm_latest_version() {
@ -290,10 +290,10 @@ nvm_do_install() {
local NVM_PROFILE local NVM_PROFILE
NVM_PROFILE="$(nvm_detect_profile)" NVM_PROFILE="$(nvm_detect_profile)"
local INSTALL_DIR local PROFILE_INSTALL_DIR
INSTALL_DIR="$(nvm_install_dir)" PROFILE_INSTALL_DIR="$(nvm_install_dir| sed "s:^$HOME:\$HOME:")"
SOURCE_STR="\nexport NVM_DIR=\"$INSTALL_DIR\"\n[ -s \"\$NVM_DIR/nvm.sh\" ] && \\. \"\$NVM_DIR/nvm.sh\" # This loads nvm\n" SOURCE_STR="\nexport NVM_DIR=\"${PROFILE_INSTALL_DIR}\"\n[ -s \"\$NVM_DIR/nvm.sh\" ] && \\. \"\$NVM_DIR/nvm.sh\" # This loads nvm\n"
COMPLETION_STR="[ -s \"\$NVM_DIR/bash_completion\" ] && \\. \"\$NVM_DIR/bash_completion\" # This loads nvm bash_completion\n" COMPLETION_STR="[ -s \"\$NVM_DIR/bash_completion\" ] && \\. \"\$NVM_DIR/bash_completion\" # This loads nvm bash_completion\n"
BASH_OR_ZSH=false BASH_OR_ZSH=false
@ -331,7 +331,7 @@ nvm_do_install() {
# Source nvm # Source nvm
# shellcheck source=/dev/null # shellcheck source=/dev/null
\. "${INSTALL_DIR}/nvm.sh" \. "$(nvm_install_dir)/nvm.sh"
nvm_check_global_modules nvm_check_global_modules

2
test/install_script/nvm_install_dir
View File

@ -19,7 +19,7 @@ unset NVM_DIR
# NVM_DIR is not set # NVM_DIR is not set
install_dir=$(nvm_install_dir) install_dir=$(nvm_install_dir)
[ "_$install_dir" = "_\$HOME/.nvm" ] || die "nvm_install_dir should default to \$HOME/.nvm. Current output: $install_dir" [ "_$install_dir" = "_$HOME/.nvm" ] || die "nvm_install_dir should default to \$HOME/.nvm. Current output: $install_dir"
cleanup cleanup