[Fix] install: fix method=script install condition

Fixes #2665; see 8937917
nvm-sh · Nov 30, 2021 · 4856407 · 4856407
1 parent 275001b
commit 4856407
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,7 +108,7 @@ jobs: @@
               - '10'
             method:
               - ''
-              # - 'script' # TODO: uncomment this.
+              - 'script'
         steps:
           - uses: Vampire/setup-wsl@v1
             with:
@@ Expand Down @@