From b93df0b82a027168fb95604fb8c9c257ee2b3c1e Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Thu, 25 Aug 2022 23:33:24 -0400 Subject: [PATCH] GRP-4317: container cp -ra does not work on openshift with different user --- .../usr-local-bin/librarySetupFilesForComponent.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container_files/usr-local-bin/librarySetupFilesForComponent.sh b/container_files/usr-local-bin/librarySetupFilesForComponent.sh index e41f37a0..63fb95db 100644 --- a/container_files/usr-local-bin/librarySetupFilesForComponent.sh +++ b/container_files/usr-local-bin/librarySetupFilesForComponent.sh @@ -5,7 +5,7 @@ setupFilesForComponent_ws() { # copy files to their appropriate locations based on passed in flags if [ "$GROUPER_WS" = "true" ] then - cp -ra /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/ + cp -r /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/ returnCode=$? echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) cp -r /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi @@ -17,7 +17,7 @@ setupFilesForComponent_scim() { if [ "$GROUPER_SCIM" = "true" ] then - cp -ra /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/ + cp -r /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/ returnCode=$? echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_scim) cp -r /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi @@ -29,7 +29,7 @@ setupFilesForComponent_ui() { if [ "$GROUPER_UI" = "true" ] || [ "$GROUPER_DAEMON" = "true" ] then - cp -ra /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ + cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ returnCode=$? echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ui) cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi