Merge branch 'dev' of https://github.com/jindrapetrik/jpexs-decompiler …

…into dev
jindrapetrik · Feb 8, 2025 · 71cddc1 · 71cddc1
2 parents 7fb0fde + 8999522
commit 71cddc1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/resources/ffdec.sh b/resources/ffdec.sh
@@ -105,15 +105,15 @@ fi
 
 # Check default java
 if [ -x "$(which java)" ]; then
-    JAVA_VERSION_OUTPUT=$(java -version 2>&1)
+    JAVA_VERSION_OUTPUT=$(java -version 2>&1 | grep -v "Picked up _JAVA_OPTIONS")
     JAVA_VERSION_OUTPUT=$(echo $JAVA_VERSION_OUTPUT | sed 's/openjdk version/java version/')
     check_java_version && exec java "${args[@]}"
 fi
 
 # Test other possible Java locations
 for JRE_PATH in $LOOKUP_JRE_DIRS; do
     if [ -x "$JRE_PATH/bin/java" ]; then
-        JAVA_VERSION_OUTPUT=$("$JRE_PATH/bin/java" -version 2>&1)
+        JAVA_VERSION_OUTPUT=$("$JRE_PATH/bin/java" -version 2>&1 | grep -v "Picked up _JAVA_OPTIONS")
         JAVA_VERSION_OUTPUT=`echo $JAVA_VERSION_OUTPUT | sed 's/openjdk version/java version/'`
         check_java_version && {
             export JRE_PATH