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

Don't bother testing --install option on source, or supporting it, unless the shell supports passing options upon sourcing.

master
Jordan Harband 2014-12-26 12:19:55 -08:00
parent 3df0caefa5
commit 9a4e9060d8
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nvm.sh
View File

@ -1102,7 +1102,7 @@ nvm() {
echo "0.21.0" echo "0.21.0"
;; ;;
"unload" ) "unload" )
unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version nvm_version_greater nvm_version_greater_than_or_equal_to > /dev/null 2>&1 unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version nvm_version_greater nvm_version_greater_than_or_equal_to nvm_supports_source_options > /dev/null 2>&1
unset RC_VERSION NVM_NODEJS_ORG_MIRROR NVM_DIR NVM_CD_FLAGS > /dev/null 2>&1 unset RC_VERSION NVM_NODEJS_ORG_MIRROR NVM_DIR NVM_CD_FLAGS > /dev/null 2>&1
;; ;;
* ) * )
@ -1111,7 +1111,11 @@ nvm() {
esac esac
} }
if [ "_$1" = "_--install" ]; then nvm_supports_source_options() {
[ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
}
if nvm_supports_source_options && [ "_$1" = "_--install" ]; then
VERSION="$(nvm_alias default 2>/dev/null)" VERSION="$(nvm_alias default 2>/dev/null)"
if [ -n "$VERSION" ]; then if [ -n "$VERSION" ]; then
nvm install "$VERSION" >/dev/null nvm install "$VERSION" >/dev/null

8
test/sourcing/Sourcing nvm.sh with --install and .nvmrc should install it
View File

@ -1,6 +1,14 @@
#!/bin/sh #!/bin/sh
die () { echo $@ ; exit 1; } die () { echo $@ ; exit 1; }
supports_source_options () {
[ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
}
if ! supports_source_options; then
echo 'this shell does not support passing options on sourcing'
exit 0;
fi
echo '0.10.2' > ../../.nvmrc || die 'creation of .nvmrc failed' echo '0.10.2' > ../../.nvmrc || die 'creation of .nvmrc failed'

8
test/sourcing/Sourcing nvm.sh with --install should install the default
View File

@ -1,6 +1,14 @@
#!/bin/sh #!/bin/sh
die () { echo $@ ; exit 1; } die () { echo $@ ; exit 1; }
supports_source_options () {
[ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
}
if ! supports_source_options; then
echo 'this shell does not support passing options on sourcing'
exit 0;
fi
echo '0.10.2' > ../../alias/default || die 'creation of default alias failed' echo '0.10.2' > ../../alias/default || die 'creation of default alias failed'