From 33a025f81699246b6d728a40e6cd24c75bc2f023 Mon Sep 17 00:00:00 2001
From: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
Date: Fri, 27 Feb 2026 16:31:45 +0530
Subject: [PATCH] fix: Updates on JVM console encoding

Signed-off-by: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
---
 scripts/apiml-common-scripts.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/apiml-common-scripts.sh b/scripts/apiml-common-scripts.sh
index e24b098733..ac2bc83b44 100755
--- a/scripts/apiml-common-scripts.sh
+++ b/scripts/apiml-common-scripts.sh
@@ -101,9 +101,12 @@ if [ "$(uname)" = "OS/390" ]; then
 
     JAVA_VERSION=$(${JAVA_HOME}/bin/javap -J-Xms4m -J-Xmx16m -verbose java.lang.String \
         | grep "major version" \
-        | cut -d " " -f5)
+        | awk '{print $NF}')
 
-    if [ $JAVA_VERSION -ge 65 ]; then # Java 21
+    # Default to 0 if parsing fails
+    JAVA_VERSION=${JAVA_VERSION:-0}
+
+    if [ "$JAVA_VERSION" -ge 65 ]; then # Java 21
         ZOWE_CONSOLE_LOG_CHARSET=IBM-1047
         # Java 21+ changed default encoding to UTF-8 (JEP 400). Set console encoding
         # to EBCDIC for z/OS SYSPRINT to prevent garbled characters in early startup logs