[Fix] `install`: fix method=script install condition

Fixes #2665; see 8937917
Jérôme Foray 2021-11-30 16:07:22 +01:00 committed by Jordan Harband
parent 275001b066
commit 4856407d26
No known key found for this signature in database
GPG Key ID: 9F6A681E35EF8B56
2 changed files with 2 additions and 2 deletions

View File

@ -108,7 +108,7 @@ jobs:
- '10' - '10'
method: method:
- '' - ''
# - 'script' # TODO: uncomment this. - 'script'
steps: steps:
- uses: Vampire/setup-wsl@v1 - uses: Vampire/setup-wsl@v1
with: with:

View File

@ -373,7 +373,7 @@ nvm_do_install() {
fi fi
install_nvm_from_git install_nvm_from_git
elif [ "${METHOD}" = 'script' ]; then elif [ "${METHOD}" = 'script' ]; then
if ! nvm_has curl || nvm_has wget; then if ! nvm_has curl && ! nvm_has wget; then
nvm_echo >&2 "You need curl or wget to install nvm" nvm_echo >&2 "You need curl or wget to install nvm"
exit 1 exit 1
fi fi