From 2c59d3dd60fd62598cfc823a98e1798ff91eb02a Mon Sep 17 00:00:00 2001 From: Vinfall <91039000+Vinfall@users.noreply.github.com> Date: Fri, 24 Jan 2025 11:07:41 +0000 Subject: [PATCH] fix: startup warning if _JAVA_OPTIONS is set --- resources/ffdec.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/ffdec.sh b/resources/ffdec.sh index 32a1e42a7e..041843c70f 100644 --- a/resources/ffdec.sh +++ b/resources/ffdec.sh @@ -105,7 +105,7 @@ 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 @@ -113,7 +113,7 @@ 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