From 4856407d2691d2135420f25d00acdb6d9b85ae3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Foray?= Date: Tue, 30 Nov 2021 16:07:22 +0100 Subject: [PATCH] [Fix] `install`: fix method=script install condition Fixes #2665; see 8937917 --- .github/workflows/windows-npm.yml | 2 +- install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-npm.yml b/.github/workflows/windows-npm.yml index 6281a42..29fef33 100644 --- a/.github/workflows/windows-npm.yml +++ b/.github/workflows/windows-npm.yml @@ -108,7 +108,7 @@ jobs: - '10' method: - '' - # - 'script' # TODO: uncomment this. + - 'script' steps: - uses: Vampire/setup-wsl@v1 with: diff --git a/install.sh b/install.sh index a4a12ba..eb37d04 100755 --- a/install.sh +++ b/install.sh @@ -373,7 +373,7 @@ nvm_do_install() { fi install_nvm_from_git 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" exit 1 fi