#966: npm detection not reliable and redundant (#969)

devonfw · Nov 18, 2022 · 7deac4b · 7deac4b
1 parent 15fa92a
commit 7deac4b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -6,6 +6,7 @@ This file documents all notable changes to https://github.com/devonfw/ide[devonf
 
 Release with small but important bugfixes:
 
+* https://github.com/devonfw/ide/issues/966[#966]: npm detection not reliable and redundant
 * https://github.com/devonfw/ide/issues/954[#954]: First install removes all folders from user path
 * https://github.com/devonfw/ide/issues/956[#956]: no matches found error if software folder missing
 * https://github.com/devonfw/ide/issues/986[#986]: eclipse commandlet ignores EXTRA_JAVA_VERSION

diff --git a/scripts/src/main/resources/scripts/command/ionic b/scripts/src/main/resources/scripts/command/ionic
@@ -26,12 +26,7 @@ function doSetup() {
     fi
   else
     doDevonCommand npm setup silent
-    local npm_command="${DEVON_IDE_HOME}/software/node/npm"
-    if [ ! -x "${npm_command}" ]
-    then
-      npm_command="${DEVON_IDE_HOME}/software/node/bin/npm"
-    fi
-    doRunCommand "'${npm_command}' install -g @ionic/cli@latest --unsafe" "install ionic-cli"
+    doDevonCommand npm install -g @ionic/cli@latest --unsafe
   fi
 }
 

diff --git a/scripts/src/main/resources/scripts/command/yarn b/scripts/src/main/resources/scripts/command/yarn
@@ -36,7 +36,7 @@ function doSetup() {
     doDevonCommand npm setup silent
     if command -v npm &> /dev/null
     then
-      doRunCommand "npm install -g yarn@${version}"
+      doDevonCommand npm install -g yarn@"${version}"
     else
       doRunCommand "brew install yarn@${version}"
     fi