From 6c2c9c62d23df5cec51ab2de9d03b1401ebe558f Mon Sep 17 00:00:00 2001
From: Chris Hyzer <mchyzer@isc.upenn.edu>
Date: Fri, 10 Dec 2021 10:24:30 -0500
Subject: [PATCH] GRP-3722: GROUPER_PUT_JAVA_HOME_IN_BASHRC, GRP-3723:
 GROUPER_JAVA_HOME

---
 container_files/usr-local-bin/libraryPrep.sh       | 8 ++++++++
 container_files/usr-local-bin/librarySetupFiles.sh | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
index bfb227b1..8bfbf64f 100644
--- a/container_files/usr-local-bin/libraryPrep.sh
+++ b/container_files/usr-local-bin/libraryPrep.sh
@@ -474,6 +474,14 @@ prep_finishEnd() {
       echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishEnd) export GROUPER_CONTEXT_COOKIES=true"
       export GROUPER_CONTEXT_COOKIES=true
     fi
+    if [ -z "$GROUPER_PUT_JAVA_HOME_IN_BASHRC" ]; then 
+      echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishEnd) export GROUPER_PUT_JAVA_HOME_IN_BASHRC=true"
+      export GROUPER_PUT_JAVA_HOME_IN_BASHRC=true
+    fi
+    if [ -z "$GROUPER_JAVA_HOME" ]; then 
+      echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishEnd) export GROUPER_JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto"
+      export GROUPER_JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
+    fi
     if [ -z "$GROUPER_TOMCAT_LOG_ACCESS" ]; then 
       echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishEnd) export GROUPER_TOMCAT_LOG_ACCESS=false"
       export GROUPER_TOMCAT_LOG_ACCESS=false
diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh
index 8f6bb70f..964bc1ec 100644
--- a/container_files/usr-local-bin/librarySetupFiles.sh
+++ b/container_files/usr-local-bin/librarySetupFiles.sh
@@ -124,8 +124,10 @@ setupFiles_storeEnvVars() {
         echo "" >> /etc/bashrc  
         echo "export GROUPER_GSH_CHECK_USER=$GROUPER_GSH_CHECK_USER" >> /etc/bashrc  
         echo "export GROUPER_GSH_USER=$GROUPER_GSH_USER" >> /etc/bashrc  
-        echo "export JAVA_HOME=$JAVA_HOME" >> /etc/bashrc  
-        echo "export PATH=$JAVA_HOME/bin:\$PATH" >> /etc/bashrc  
+        if [ "$GROUPER_PUT_JAVA_HOME_IN_BASHRC" = "true" ]; then
+          echo "export JAVA_HOME=$GROUPER_JAVA_HOME" >> /etc/bashrc  
+          echo "export PATH=$GROUPER_JAVA_HOME/bin:\$PATH" >> /etc/bashrc
+        fi  
         echo "" >> /etc/bashrc  
         returnCode=$?
         echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_storeEnvVars)  echo env var script to /etc/bashrc, result: $returnCode"