From cb138a1815ca6c8136193018bf3cc2284100ef38 Mon Sep 17 00:00:00 2001 From: David Mankin Date: Tue, 15 Sep 2015 23:27:51 +0000 Subject: [PATCH 1/6] Fix error messages in tests --- test/install_script/nvm_detect_profile | 55 +++++++++++++------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/test/install_script/nvm_detect_profile b/test/install_script/nvm_detect_profile index 8676bcf..da185e3 100755 --- a/test/install_script/nvm_detect_profile +++ b/test/install_script/nvm_detect_profile @@ -27,19 +27,18 @@ SHELL="/bin/bash" # $SHELL is set to bash and .bashrc is there, it must be detected _PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.bashrc" ] || echo "_\$HOME/.bashrc: _$HOME/.bashrc\n" \ - echo "_\$_PROFILE: _$_PROFILE\n" \ - die "nvm_detect_profile didn't pick $SHELL and $HOME/.bashrc" +[ "_$_PROFILE" = "_$HOME/.bashrc" ] || ( echo "_\$HOME/.bashrc: _$HOME/.bashrc" && + echo "_\$_PROFILE: _$_PROFILE" && + die "nvm_detect_profile didn't pick $SHELL and $HOME/.bashrc" ) #Let's force $SHELL to be zsh SHELL="/usr/bin/zsh" # $SHELL is set to zsh and .zshrc is there, it must be detected _PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.zshrc" ] || echo "_\$HOME/.zshrc: _$HOME/.zshrc\n" \ - echo "_\$_PROFILE: _$_PROFILE\n" \ - die "nvm_detect_profile didn't pick $SHELL and $HOME/.zshrc" - +[ "_$_PROFILE" = "_$HOME/.zshrc" ] || ( echo "_\$HOME/.zshrc: _$HOME/.zshrc" && + echo "_\$_PROFILE: _$_PROFILE" && + die "nvm_detect_profile didn't pick $SHELL and $HOME/.zshrc" ) # if we unset shell it looks for the files unset SHELL @@ -47,16 +46,16 @@ unset SHELL # $PROFILE points to a valid file, its path must be returned PROFILE="test_profile" _PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$PROFILE" ] || echo "_\$_PROFILE: _$_PROFILE\n" \ - echo "_\$PROFILE: _$PROFILE\n" \ - die "nvm_detect_profile didn't pick \$PROFILE" +[ "_$_PROFILE" = "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile didn't pick \$PROFILE" ) # $PROFILE doesn't point to a valid file, its path must not be returned PROFILE="invalid_profile" _PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" != "_$PROFILE" ] || echo "_\$_PROFILE: _$_PROFILE\n" \ - echo "_\$PROFILE: _$PROFILE\n" \ - die "nvm_detect_profile shouldn't pick \$PROFILE when it's not a valid file" +[ "_$_PROFILE" != "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile shouldn't pick \$PROFILE when it's not a valid file" ) # Below are tests for when $PROFILE is undefined @@ -65,37 +64,37 @@ unset PROFILE # It should favor .profile if file exists _PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.profile" ] || echo "_\$_PROFILE: _$_PROFILE\n" \ - echo "_\$PROFILE: _$PROFILE\n" \ - die "nvm_detect_profile should have selected .profile" +[ "_$_PROFILE" = "_$HOME/.profile" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile should have selected .profile" ) rm .profile # Otherwise, it should favor .bashrc if file exists _PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.bashrc" ] || echo "_\$_PROFILE: _$_PROFILE\n" \ - echo "_\$PROFILE: _$PROFILE\n" \ - die "nvm_detect_profile should have selected .bashrc" +[ "_$_PROFILE" = "_$HOME/.bashrc" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile should have selected .bashrc" ) rm .bashrc # Otherwise, it should favor .bash_profile if file exists _PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.bash_profile" ] || echo "_\$_PROFILE: _$_PROFILE\n" \ - echo "_\$PROFILE: _$PROFILE\n" \ - die "nvm_detect_profile should have selected .bash_profile" +[ "_$_PROFILE" = "_$HOME/.bash_profile" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile should have selected .bash_profile" ) rm .bash_profile # Otherwise, it should favor .zshrc if file exists _PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.zshrc" ] || echo "_\$_PROFILE: _$_PROFILE\n" \ - echo "_\$PROFILE: _$PROFILE\n" \ - die "nvm_detect_profile should have selected .zshrc" +[ "_$_PROFILE" = "_$HOME/.zshrc" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile should have selected .zshrc" ) rm .zshrc # It should be empty if none is found _PROFILE=$(nvm_detect_profile) -[ -z "$_PROFILE" ] || echo "_\$_PROFILE: _$_PROFILE\n" \ - echo "_\$PROFILE: _$PROFILE\n" \ - die "nvm_detect_profile should have echo'ed an empty value" +[ -z "$_PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile should have echo'ed an empty value" ) cleanup From 918fcb4bd27d80f7b16e2512e7ca499b7a78ddc0 Mon Sep 17 00:00:00 2001 From: David Mankin Date: Tue, 15 Sep 2015 23:34:02 +0000 Subject: [PATCH 2/6] PROFILE env var should override detected profile Add tests for PROFILE overriding detected files --- install.sh | 8 +++++--- test/install_script/nvm_detect_profile | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index cd78a12..b055eee 100755 --- a/install.sh +++ b/install.sh @@ -115,6 +115,10 @@ install_nvm_as_script() { # Otherwise, an empty string is returned # nvm_detect_profile() { + if [ -n "$PROFILE" -a -f "$PROFILE" ]; then + echo "$PROFILE" + return + fi local DETECTED_PROFILE DETECTED_PROFILE='' @@ -132,9 +136,7 @@ nvm_detect_profile() { fi if [ -z "$DETECTED_PROFILE" ]; then - if [ -f "$PROFILE" ]; then - DETECTED_PROFILE="$PROFILE" - elif [ -f "$HOME/.profile" ]; then + if [ -f "$HOME/.profile" ]; then DETECTED_PROFILE="$HOME/.profile" elif [ -f "$HOME/.bashrc" ]; then DETECTED_PROFILE="$HOME/.bashrc" diff --git a/test/install_script/nvm_detect_profile b/test/install_script/nvm_detect_profile index da185e3..4ec8e43 100755 --- a/test/install_script/nvm_detect_profile +++ b/test/install_script/nvm_detect_profile @@ -31,6 +31,15 @@ _PROFILE=$(nvm_detect_profile) echo "_\$_PROFILE: _$_PROFILE" && die "nvm_detect_profile didn't pick $SHELL and $HOME/.bashrc" ) +# But $PROFILE should override +PROFILE=test_profile +_PROFILE=$(nvm_detect_profile) +[ "_$_PROFILE" = "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile didn't pick \$PROFILE" ) +unset PROFILE + + #Let's force $SHELL to be zsh SHELL="/usr/bin/zsh" @@ -40,6 +49,14 @@ _PROFILE=$(nvm_detect_profile) echo "_\$_PROFILE: _$_PROFILE" && die "nvm_detect_profile didn't pick $SHELL and $HOME/.zshrc" ) +# But $PROFILE should override +PROFILE=test_profile +_PROFILE=$(nvm_detect_profile) +[ "_$_PROFILE" = "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && + echo "_\$PROFILE: _$PROFILE" && + die "nvm_detect_profile didn't pick \$PROFILE" ) +unset PROFILE + # if we unset shell it looks for the files unset SHELL From 645bda4987be74a0aa2bc10c26e932a5d3b08a45 Mon Sep 17 00:00:00 2001 From: Matthew Campbell Date: Fri, 1 Jan 2016 14:09:35 -0500 Subject: [PATCH 3/6] Addresses comments to close #833 --- test/install_script/nvm_detect_profile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/install_script/nvm_detect_profile b/test/install_script/nvm_detect_profile index 4ec8e43..e25572e 100755 --- a/test/install_script/nvm_detect_profile +++ b/test/install_script/nvm_detect_profile @@ -32,7 +32,7 @@ _PROFILE=$(nvm_detect_profile) die "nvm_detect_profile didn't pick $SHELL and $HOME/.bashrc" ) # But $PROFILE should override -PROFILE=test_profile +_PROFILE="$(PROFILE=test_profile nvm_detect_profile)" _PROFILE=$(nvm_detect_profile) [ "_$_PROFILE" = "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && echo "_\$PROFILE: _$PROFILE" && @@ -50,7 +50,7 @@ _PROFILE=$(nvm_detect_profile) die "nvm_detect_profile didn't pick $SHELL and $HOME/.zshrc" ) # But $PROFILE should override -PROFILE=test_profile +_PROFILE="$(PROFILE=test_profile nvm_detect_profile)" _PROFILE=$(nvm_detect_profile) [ "_$_PROFILE" = "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && echo "_\$PROFILE: _$PROFILE" && From 8dc53d4dd553bdb37224d70db14baa6e15607e63 Mon Sep 17 00:00:00 2001 From: Matthew Campbell Date: Fri, 1 Jan 2016 20:45:36 -0500 Subject: [PATCH 4/6] Refactor and fix nvm_detect_profile tests close #833 close #957 --- test/install_script/nvm_detect_profile | 174 ++++++++++++------------- 1 file changed, 84 insertions(+), 90 deletions(-) diff --git a/test/install_script/nvm_detect_profile b/test/install_script/nvm_detect_profile index e25572e..4a15efa 100755 --- a/test/install_script/nvm_detect_profile +++ b/test/install_script/nvm_detect_profile @@ -1,117 +1,111 @@ #!/bin/sh -cleanup () { - unset -f setup cleanup die - unset _PROFILE - rm -f .bashrc .bash_profile .zshrc .profile test_profile > /dev/null 2>&1 -} -die () { echo $@ ; cleanup ; exit 1; } - -NVM_ENV=testing . ../../install.sh - setup () { - touch .bashrc - touch .bash_profile - touch .zshrc - touch .profile - touch test_profile + HOME="." + NVM_ENV=testing . ../../install.sh + touch ".bashrc" + touch ".bash_profile" + touch ".zshrc" + touch ".profile" + touch "test_profile" } -#Let's hack $HOME -HOME="." +cleanup () { + unset HOME + unset NVM_ENV + unset NVM_DETECT_PROFILE + unset -f setup cleanup die + rm -f ".bashrc" ".bash_profile" ".zshrc" ".profile" "test_profile" > "/dev/null" 2>&1 +} + +die () { echo "$@"; cleanup; exit 1; } setup -#Let's force $SHELL to be bash -SHELL="/bin/bash" +# +# Confirm profile detection via $SHELL works and that $PROFILE overrides profile detection +# -# $SHELL is set to bash and .bashrc is there, it must be detected -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.bashrc" ] || ( echo "_\$HOME/.bashrc: _$HOME/.bashrc" && - echo "_\$_PROFILE: _$_PROFILE" && - die "nvm_detect_profile didn't pick $SHELL and $HOME/.bashrc" ) +# .bashrc should be detected for bash +NVM_DETECT_PROFILE="$(declare SHELL="/bin/bash"; unset PROFILE; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "$HOME/.bashrc" ]; then + die "nvm_detect_profile didn't pick \$HOME/.bashrc for bash" +fi -# But $PROFILE should override -_PROFILE="$(PROFILE=test_profile nvm_detect_profile)" -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile didn't pick \$PROFILE" ) -unset PROFILE +# $PROFILE should override .bashrc profile detection +NVM_DETECT_PROFILE="$(declare SHELL="/bin/bash"; declare PROFILE="test_profile"; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then + die "nvm_detect_profile ignored \$PROFILE" +fi + +# .zshrc should be detected for zsh +NVM_DETECT_PROFILE="$(declare SHELL="/usr/bin/zsh"; unset PROFILE; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then + die "nvm_detect_profile didn't pick \$HOME/.zshrc for zsh" +fi + +# $PROFILE should override .zshrc profile detection +NVM_DETECT_PROFILE="$(declare SHELL="/usr/bin/zsh"; declare PROFILE="test_profile"; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then + die "nvm_detect_profile ignored \$PROFILE" +fi -#Let's force $SHELL to be zsh -SHELL="/usr/bin/zsh" +# +# Confirm $PROFILE is only returned when it points to a valid file +# -# $SHELL is set to zsh and .zshrc is there, it must be detected -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.zshrc" ] || ( echo "_\$HOME/.zshrc: _$HOME/.zshrc" && - echo "_\$_PROFILE: _$_PROFILE" && - die "nvm_detect_profile didn't pick $SHELL and $HOME/.zshrc" ) +# $PROFILE is a valid file +NVM_DETECT_PROFILE="$(declare PROFILE="test_profile"; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then + die "nvm_detect_profile didn't pick \$PROFILE when it was a valid file" +fi -# But $PROFILE should override -_PROFILE="$(PROFILE=test_profile nvm_detect_profile)" -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile didn't pick \$PROFILE" ) -unset PROFILE +# $PROFILE is not a valid file +rm "test_profile" +NVM_DETECT_PROFILE="$(declare PROFILE="test_profile"; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" = "test_profile" ]; then + die "nvm_detect_profile picked \$PROFILE when it was an invalid file" +fi -# if we unset shell it looks for the files -unset SHELL - -# $PROFILE points to a valid file, its path must be returned -PROFILE="test_profile" -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile didn't pick \$PROFILE" ) - -# $PROFILE doesn't point to a valid file, its path must not be returned -PROFILE="invalid_profile" -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" != "_$PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile shouldn't pick \$PROFILE when it's not a valid file" ) - - -# Below are tests for when $PROFILE is undefined -rm test_profile -unset PROFILE +# +# When profile detection fails via both $PROFILE and $SHELL, profile detection should select based on the existence of +# one of the following files is the following order: .profile, .bashrc, .bash_profile, .zshrc and +# return an empty value if everything fails +# # It should favor .profile if file exists -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.profile" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile should have selected .profile" ) +NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "$HOME/.profile" ]; then + die "nvm_detect_profile should have selected .profile ($NVM_DETECT_PROFILE) ($SHELL)" +fi -rm .profile # Otherwise, it should favor .bashrc if file exists -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.bashrc" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile should have selected .bashrc" ) +rm ".profile" +NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "$HOME/.bashrc" ]; then + die "nvm_detect_profile should have selected .bashrc" +fi -rm .bashrc # Otherwise, it should favor .bash_profile if file exists -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.bash_profile" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile should have selected .bash_profile" ) +rm ".bashrc" +NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "$HOME/.bash_profile" ]; then + die "nvm_detect_profile should have selected .bash_profile" +fi -rm .bash_profile # Otherwise, it should favor .zshrc if file exists -_PROFILE=$(nvm_detect_profile) -[ "_$_PROFILE" = "_$HOME/.zshrc" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile should have selected .zshrc" ) +rm ".bash_profile" +NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)" +if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then + die "nvm_detect_profile should have selected .zshrc" +fi -rm .zshrc # It should be empty if none is found -_PROFILE=$(nvm_detect_profile) -[ -z "$_PROFILE" ] || ( echo "_\$_PROFILE: _$_PROFILE" && - echo "_\$PROFILE: _$PROFILE" && - die "nvm_detect_profile should have echo'ed an empty value" ) - +rm ".zshrc" +NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)" +if [ ! -z "$NVM_DETECT_PROFILE" ]; then + die "nvm_detect_profile should have returned an empty value" +fi cleanup From 78fee866f53df567b79c6028d0cca04c584a46dd Mon Sep 17 00:00:00 2001 From: Matthew Campbell Date: Fri, 1 Jan 2016 22:33:45 -0500 Subject: [PATCH 5/6] Remove usage of declare --- test/install_script/nvm_detect_profile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/install_script/nvm_detect_profile b/test/install_script/nvm_detect_profile index 4a15efa..b459afc 100755 --- a/test/install_script/nvm_detect_profile +++ b/test/install_script/nvm_detect_profile @@ -27,25 +27,25 @@ setup # # .bashrc should be detected for bash -NVM_DETECT_PROFILE="$(declare SHELL="/bin/bash"; unset PROFILE; nvm_detect_profile)" +NVM_DETECT_PROFILE="$(SHELL="/bin/bash"; unset PROFILE; nvm_detect_profile)" if [ "$NVM_DETECT_PROFILE" != "$HOME/.bashrc" ]; then die "nvm_detect_profile didn't pick \$HOME/.bashrc for bash" fi # $PROFILE should override .bashrc profile detection -NVM_DETECT_PROFILE="$(declare SHELL="/bin/bash"; declare PROFILE="test_profile"; nvm_detect_profile)" +NVM_DETECT_PROFILE="$(SHELL="/bin/bash"; PROFILE="test_profile"; nvm_detect_profile)" if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then die "nvm_detect_profile ignored \$PROFILE" fi # .zshrc should be detected for zsh -NVM_DETECT_PROFILE="$(declare SHELL="/usr/bin/zsh"; unset PROFILE; nvm_detect_profile)" +NVM_DETECT_PROFILE="$(SHELL="/usr/bin/zsh"; unset PROFILE; nvm_detect_profile)" if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then die "nvm_detect_profile didn't pick \$HOME/.zshrc for zsh" fi # $PROFILE should override .zshrc profile detection -NVM_DETECT_PROFILE="$(declare SHELL="/usr/bin/zsh"; declare PROFILE="test_profile"; nvm_detect_profile)" +NVM_DETECT_PROFILE="$(SHELL="/usr/bin/zsh"; PROFILE="test_profile"; nvm_detect_profile)" if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then die "nvm_detect_profile ignored \$PROFILE" fi @@ -56,14 +56,14 @@ fi # # $PROFILE is a valid file -NVM_DETECT_PROFILE="$(declare PROFILE="test_profile"; nvm_detect_profile)" +NVM_DETECT_PROFILE="$(PROFILE="test_profile"; nvm_detect_profile)" if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then die "nvm_detect_profile didn't pick \$PROFILE when it was a valid file" fi # $PROFILE is not a valid file rm "test_profile" -NVM_DETECT_PROFILE="$(declare PROFILE="test_profile"; nvm_detect_profile)" +NVM_DETECT_PROFILE="$(PROFILE="test_profile"; nvm_detect_profile)" if [ "$NVM_DETECT_PROFILE" = "test_profile" ]; then die "nvm_detect_profile picked \$PROFILE when it was an invalid file" fi From 4f4ff208eb82b45bfea07e12a21f5eff4bf2de95 Mon Sep 17 00:00:00 2001 From: Matthew Campbell Date: Sat, 2 Jan 2016 11:16:50 -0500 Subject: [PATCH 6/6] Improve error messages --- test/install_script/nvm_detect_profile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/install_script/nvm_detect_profile b/test/install_script/nvm_detect_profile index b459afc..92da1d2 100755 --- a/test/install_script/nvm_detect_profile +++ b/test/install_script/nvm_detect_profile @@ -18,7 +18,7 @@ cleanup () { rm -f ".bashrc" ".bash_profile" ".zshrc" ".profile" "test_profile" > "/dev/null" 2>&1 } -die () { echo "$@"; cleanup; exit 1; } +die () { echo "$@" '$NVM_DETECT_PROFILE:' "$NVM_DETECT_PROFILE"; cleanup; exit 1; } setup @@ -77,7 +77,7 @@ fi # It should favor .profile if file exists NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)" if [ "$NVM_DETECT_PROFILE" != "$HOME/.profile" ]; then - die "nvm_detect_profile should have selected .profile ($NVM_DETECT_PROFILE) ($SHELL)" + die "nvm_detect_profile should have selected .profile" fi # Otherwise, it should favor .bashrc if file exists