fix swagger

docker · Sep 13, 2024 · 415821e · 415821e
1 parent cd963d5
commit 415821e
Showing 1 changed file with 6 additions and 19 deletions.
diff --git a/container_files/usr-local-bin/librarySetupFilesForComponent.sh b/container_files/usr-local-bin/librarySetupFilesForComponent.sh
@@ -10,14 +10,9 @@ setupFilesForComponent_ws() {
        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
 
-       if [ ! -z "$GROUPERWS_URL_WITH_CONTEXT_NOSLASH" ]; then
-        sed -i "s|http://localhost:8400/grouper-ws|/$GROUPERWS_URL_WITH_CONTEXT_NOSLASH/|g" /opt/grouper/grouperWebapp/docs/index.html
-        returnCode=$?
-        echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) sed -i \"s|http://localhost:8400/grouper-ws|/$GROUPERWS_URL_WITH_CONTEXT_NOSLASH/|g\" /opt/grouper/grouperWebapp/docs/index.html , result: $returnCode"
-        if [ $returnCode != 0 ]; then exit $returnCode; fi
 
        if [ ! -z "$GROUPERWS_URL_WITH_CONTEXT_NOSLASH" ]; then
-        sed -i "s|http://localhost:8400/grouper-ws|/$GROUPERWS_URL_WITH_CONTEXT_NOSLASH/|g" /opt/grouper/grouperWebapp/docs/index.html
+        sed -i "s|http://localhost:8400/grouper-ws|$GROUPERWS_URL_WITH_CONTEXT_NOSLASH|g" /opt/grouper/grouperWebapp/docs/index.html
         returnCode=$?
         echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) sed -i \"s|http://localhost:8400/grouper-ws|/$GROUPERWS_URL_WITH_CONTEXT_NOSLASH/|g\" /opt/grouper/grouperWebapp/docs/index.html , result: $returnCode"
         if [ $returnCode != 0 ]; then exit $returnCode; fi
@@ -34,19 +29,11 @@ setupFilesForComponent_ws() {
         echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) GROUPERWS_URL_CONTEXT is not set, so not adjusting context in swagger , result: $returnCode"
        fi
 
-       else
-        echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) GROUPERWS_URL_WITH_CONTEXT_NOSLASH is not set, so not adjusting URL in swagger , result: $returnCode"
-       fi
-
-       if [ ! -z "$GROUPERWS_URL_CONTEXT" ]; then
-        sed -i "s|/grouper-ws/|/$GROUPERWS_URL_CONTEXT/|g" /opt/grouper/grouperWebapp/docs/index.json
-        returnCode=$?
-        echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) sed -i \"s|/grouper-ws/|/$GROUPERWS_URL_CONTEXT/|g\" /opt/grouper/grouperWebapp/docs/index.json , result: $returnCode"
-        if [ $returnCode != 0 ]; then exit $returnCode; fi
-       else
-        echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) GROUPERWS_URL_CONTEXT is not set, so not adjusting context in swagger , result: $returnCode"
-       fi
-
+  else 
+    rm -rf /opt/grouper/grouperWebapp/docs
+    returnCode=$?
+    echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) rm -rf /opt/grouper/grouperWebapp/docs , result: $returnCode"
+    if [ $returnCode != 0 ]; then exit $returnCode; fi
   fi
 
 }