#986: fixed eclipse java detection (#987)

devonfw · Nov 17, 2022 · 2e5e0ad · 2e5e0ad
1 parent fc49baf
commit 2e5e0ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -8,6 +8,7 @@ Release with small but important bugfixes:
 
 * 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].

diff --git a/scripts/src/main/resources/scripts/command/eclipse b/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