add camunda and java exports

NASA-AMMOS · Feb 20, 2024 · 1493b65 · 1493b65
1 parent 343d5e9
commit 1493b65
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java b/cws-installer/src/main/java/jpl/cws/task/CwsInstaller.java
@@ -265,6 +265,8 @@ public static void main(String args[]) {
 			}
 
 			getVersion();
+			getCamundaVersion();
+			getJavaVersion();
 			getOsName();
 			getTotalPhysicalMemory();
 			checkCompiler();
@@ -374,9 +376,6 @@ private static void init() {
 		ldap_identity_plugin_class = getPreset(LDAP_IDENTITY_PLUGIN_CLASS);
 		ldap_security_filter_class = getPreset(LDAP_SECURITY_FILTER_CLASS);
 		camunda_security_filter_class = getPreset(CAMUNDA_SECURITY_FILTER_CLASS);
-		camunda_version = getPreset("camunda_version");
-
-		java_version = getPreset("java_version");
 	}
 
 	private static void exit(int status) {
@@ -387,6 +386,14 @@ private static void getVersion() {
 		cws_version = getenv("CWS_VER");
 	}
 
+	private static void getCamundaVersion() {
+		camunda_version = getenv("CAMUNDA_VER");
+	}
+
+	private static void getJavaVersion() {
+		java_version = getenv("JAVA_HOME_VERSION");
+	}
+
 	private static void getOsName() {
 		osName = getProperty("os.name");
 	}

diff --git a/utils.sh b/utils.sh
@@ -140,6 +140,7 @@ function check_java_requirements () {
 
     JAVA_HOME_VERSION=$("${JAVA_HOME}/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}')
     print "  JAVA_HOME Java version : ${JAVA_HOME_VERSION}"
+    export JAVA_HOME_VERSION
 
     JAVA_PATH_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
     print "  PATH      Java version : ${JAVA_PATH_VERSION}  $(which java)"