From 732a0e1496c90307fe26c527cf655ae14c9ccb3f Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Thu, 28 Jan 2021 01:42:22 -0500 Subject: [PATCH] fix container --- container_files/usr-local-bin/libraryPrepOnly.sh | 4 ++-- container_files/usr-local-bin/librarySetupFiles.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/container_files/usr-local-bin/libraryPrepOnly.sh b/container_files/usr-local-bin/libraryPrepOnly.sh index bbd2369d..79ec4f44 100644 --- a/container_files/usr-local-bin/libraryPrepOnly.sh +++ b/container_files/usr-local-bin/libraryPrepOnly.sh @@ -47,9 +47,9 @@ prepOnly_ui() { prepOnly_ws() { if [ "$GROUPER_WS_ONLY" = "true" ] then - if [ -z "$GROUPER_LOG_PREFIX" ]; then export + if [ -z "$GROUPER_LOG_PREFIX" ]; then echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_ui) export GROUPER_LOG_PREFIX=grouper-ws" - GROUPER_LOG_PREFIX=grouper-ws + export GROUPER_LOG_PREFIX=grouper-ws fi if [ -z "$GROUPER_CONTEXT_COOKIES" ]; then echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_ui) export GROUPER_CONTEXT_COOKIES=false" diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh index ed5bbb5e..092e02fb 100644 --- a/container_files/usr-local-bin/librarySetupFiles.sh +++ b/container_files/usr-local-bin/librarySetupFiles.sh @@ -83,6 +83,9 @@ setupFiles_storeEnvVars() { if [ $returnCode != 0 ]; then exit $returnCode; fi sed -i "s|^GROUPER|export GROUPER|g" /opt/grouper/grouperEnv.sh + returnCode=$? + echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_storeEnvVars) sed -i \"s|^GROUPER|export GROUPER|g\" /opt/grouper/grouperEnv.sh , result: $returnCode" + if [ $returnCode != 0 ]; then exit $returnCode; fi if [ ! -f /home/tomcat/.bashrc ] then