Merge branch 'master' into feature/devonfw#966-npm-detection-not-reli…

…able-and-redundant-

CHANGELOG.asciidoc

@@ -4,9 +4,13 @@ This file documents all notable changes to https://github.com/devonfw/ide[devonf
 
 == 2022.11.002
 
-WIP: Release with small but important bugfixes:
+Release with small but important bugfixes:
 
-* https://github.com/devonfw/ide/issues/903[#966]: Fixxed some issues with the npm detection.
+* 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
+* https://github.com/devonfw/ide/issues/974[#974]: Fix dotnet command for nightly test
 
 The full list of changes for this release can be found in https://github.com/devonfw/ide/milestone/35?closed=1[milestone 2022.11.002].
 

documentation/devonfw-ide-contribution-getting-started.asciidoc

@@ -140,7 +140,7 @@ Install https://schinagl.priv.at/nt/hardlinkshellext/linkshellextension.html[lin
 Later on you can make symbolic links of files or folder from your "git folder" and add them into the folder in which the testing is supposed to take place:
 
 So select the folder `${DEVON_IDE_HOME}/workspaces/ide/scripts/src/main/resources/scripts/command/` and choose `Pick Link Source` and then go to `${DEVON_IDE_HOME}/scripts/` delete the `command` folder and re-create it as symbolic link via `Drop as... > Symbolic link`.
-Do the same also for `functions`, `environment-project`, `environment-project.bat`, `devon`, `devon.bat`, `autocomplete`, and `devon-autocomplete`.
+Do the same also for `functions`, `functions-core`, `commandlet-cli`, `environment-project`, `environment-project.bat`, `devon`, `devon.bat`, `autocomplete`, and `devon-autocomplete`.
 Now changes you make in the first mentioned file  will directly be available in your testing environment through the created file-link in the testing environment.
 
 === developer tools

documentation/lombok.asciidoc

@@ -26,6 +26,6 @@ However, to avoid manual extra effort for lombok based projects you only need to
 
 == Lombok for IntelliJ
 
-For IntelliJ there is a plugin to activate https://projectlombok.org/setup/intellij[lombok support in IntelliJ].
-Currently we have not yet configured or automated this in `devonfw-ide`.
-Please contribute to change this. See issues https://github.com/devonfw/ide/issues/453[#453] and https://github.com/devonfw/ide/issues/491[#491].
+According to the https://projectlombok.org/setup/intellij[official Lombok page for IntelliJ], no plugins are required for Lombok support as of IntelliJ version 2020.3 and above.
+
+

scripts/src/main/resources/scripts/command/dotnet

@@ -32,7 +32,7 @@ function doSetup() {
   then
     doDebug "Devon4net template already installed."
   else
-    doRun new -i devon4net.WebApi.Template
+    doRunCommand "'${DOTNET}' new -i devon4net.WebApi.Template"
   fi
 }
 

scripts/src/main/resources/scripts/command/eclipse

@@ -22,11 +22,6 @@ if doIsWindows
 then
   ECLIPSE="${ECLIPSE_HOME}/eclipsec"
 fi
-ECLIPSE_JAVA_HOME="${JAVA_HOME}"
-if [ -n "${EXTRA_JAVA_VERSION}" ]
-then
-  ECLIPSE_JAVA_HOME="${DEVON_IDE_HOME}/software/extra/java"
-fi
 ECLIPSE_PRODUCT="${ECLIPSE_HOME}/.eclipseproduct"
 if doIsMacOs
 then
@@ -35,6 +30,11 @@ fi
 TOOL_VERSION_COMMAND="cat '${ECLIPSE_PRODUCT}'"
 # shellcheck source=scripts/commandlet-cli
 source "$(dirname "${0}")"/../commandlet-cli
+ECLIPSE_JAVA_HOME="${JAVA_HOME}"
+if [ -n "${EXTRA_JAVA_VERSION}" ]
+then
+  ECLIPSE_JAVA_HOME="${DEVON_IDE_HOME}/software/extra/java"
+fi
 
 L_PWD=$(pwd)
 cd "${DEVON_IDE_HOME}" || exit 255

scripts/src/main/resources/scripts/devon.bat

@@ -1,4 +1,6 @@
 @echo off
+setlocal ENABLEDELAYEDEXPANSION
+
 if NOT "%DEVON_IDE_TRACE%"=="" echo on
 if "%1%" == "-v" (
   goto :print_version
@@ -26,23 +28,23 @@ for %%f in (devon.bat) do set "p=%%~$PATH:f"
 if not defined p (
   echo Adding %USERPROFILE%\scripts to your users system PATH
   for /F "tokens=2* delims= " %%f IN ('reg query HKCU\Environment /v PATH ^| findstr /i path') do set USER_PATH=%%g
-  if "%USER_PATH:~-1,1%" == ";" (
-    set "USER_PATH=%USER_PATH:~0,-1%"
+  if "!USER_PATH:~-1,1!" == ";" (
+    set "USER_PATH=!USER_PATH:~0,-1!"
   )
-  if "%USER_PATH%" == "" (
+  if "!USER_PATH!" == "" (
     setx PATH "%%USERPROFILE%%\scripts"
     echo %_fBYellow%"ATTENTION:"%_RESET%
     echo "Your user PATH environment variable has not been previously set."
     echo "You may need to log-off and log-in again so your PATH changes are properly applied."
     echo "Otherwise you may get errors that devon command has not been found."
     pause
   ) else (
-    setx PATH "%USER_PATH%;%%USERPROFILE%%\scripts"
+    setx PATH "!USER_PATH!;%%USERPROFILE%%\scripts"
   )
-  if "%PATH:~-1,1%" == ";" (
-    set "PATH=%PATH%%USERPROFILE%\scripts"
+  if "!PATH:~-1,1!" == ";" (
+    set "PATH=!PATH!%USERPROFILE%\scripts"
   ) else (
-    set "PATH=%PATH%;%USERPROFILE%\scripts"
+    set "PATH=!PATH!;%USERPROFILE%\scripts"
   )
   echo %_fBGreen%The devon CLI script has been installed to your windows system.%_RESET%
   echo %_fBGreen%Now in any new command shell, you can call devon to setup your IDE enviromennt variables.%_RESET%

scripts/src/main/resources/scripts/functions-core

@@ -99,24 +99,27 @@ function doUpdatePath() {
   fi
   # Setup path
   SOFTWARE_PATH=${DEVON_IDE_HOME}/software
-  for SOFTWARE_FOLDER in "${SOFTWARE_PATH}"/*
-  do
-    if [ "${SOFTWARE_FOLDER}" != "${SOFTWARE_PATH}/extra" ]
-    then
-      if [ -d "${SOFTWARE_FOLDER}/bin" ]
-      then
-        PATH="${SOFTWARE_FOLDER}/bin:${PATH}"
-      else
-        PATH="${SOFTWARE_FOLDER}:${PATH}"
-      fi
-      # Load custom configuration of software
-      if [ -e "${SOFTWARE_FOLDER}/ide-config" ]
+  if [ -d "${SOFTWARE_PATH}" ]
+  then
+    for SOFTWARE_FOLDER in "${SOFTWARE_PATH}"/*
+    do
+      if [ "${SOFTWARE_FOLDER}" != "${SOFTWARE_PATH}/extra" ] && [ -d "${SOFTWARE_FOLDER}" ]
       then
-        # shellcheck disable=SC1090,SC1091
-        source "${SOFTWARE_FOLDER}/ide-config"
+        if [ -d "${SOFTWARE_FOLDER}/bin" ]
+        then
+          PATH="${SOFTWARE_FOLDER}/bin:${PATH}"
+        else
+          PATH="${SOFTWARE_FOLDER}:${PATH}"
+        fi
+        # Load custom configuration of software
+        if [ -e "${SOFTWARE_FOLDER}/ide-config" ]
+        then
+          # shellcheck disable=SC1090,SC1091
+          source "${SOFTWARE_FOLDER}/ide-config"
+        fi
       fi
-    fi
-  done
+    done
+  fi
 
   # node.js support
   if [ -d "${DEVON_IDE_HOME}/software/nodejs" ]
@@ -158,4 +161,4 @@ function doEnvironmentProject() {
   # load user settings late so variables like M2_REPO can be overridden
   doLoadProperties "${DEVON_IDE_HOME}/conf/devon.properties" "" "${@}"
   export PATH
-}
+}

scripts/src/test/bash/integration-test-vscode

@@ -1,4 +1,6 @@
 #!/bin/bash
 
 source "$(dirname "${0}")"/functions-test
-doCommandTest vscode
+#workaround for nightly-tests
+echo "plugin_active=false" >> settings/vscode/plugins/devonfw-extension-pack.properties
+doCommandTest vscode