From 6a01e651820c680af562d510d259c25cae2e98ae Mon Sep 17 00:00:00 2001
From: Simon Seyock <8100558+simonseyock@users.noreply.github.com>
Date: Mon, 15 Jul 2024 14:25:37 +0200
Subject: [PATCH 1/3] fix: use more slashes to make script more robust

---
 update_credentials.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/update_credentials.sh b/update_credentials.sh
index 599ae9f..46f8695 100644
--- a/update_credentials.sh
+++ b/update_credentials.sh
@@ -10,27 +10,27 @@ if [ ${DEBUG} ]; then
 fi;
 
 # copy over default security folder to data dir (if not existing)
-if [ ! -d "${GEOSERVER_DATA_DIR}security" ]; then
-  cp -r ${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security" ${GEOSERVER_DATA_DIR}
+if [ ! -d "${GEOSERVER_DATA_DIR}/security" ]; then
+  cp -r ${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security" ${GEOSERVER_DATA_DIR}/
 fi
 
 GEOSERVER_ADMIN_USER=${GEOSERVER_ADMIN_USER:-admin}
 GEOSERVER_ADMIN_PASSWORD=${GEOSERVER_ADMIN_PASSWORD:-geoserver}
 
 # templates to use as base for replacement
-USERS_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security/usergroup/default/users.xml"
+USERS_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security/usergroup/default/users.xml"
 echo "USING USERS XML ORIGINAL:" $USERS_XML_ORIG
-ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security/role/default/roles.xml"
+ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security/role/default/roles.xml"
 echo "USING ROLES XML ORIGINAL:" $ROLES_XML_ORIG
 
 # final users.xml file GeoServer data dir
-USERS_XML=${USERS_XML:-${GEOSERVER_DATA_DIR}security/usergroup/default/users.xml}
+USERS_XML=${USERS_XML:-${GEOSERVER_DATA_DIR}/security/usergroup/default/users.xml}
 echo "SETTING USERS XML:" $USERS_XML
 # final roles.xml file GeoServer data dir
-ROLES_XML=${ROLES_XML:-${GEOSERVER_DATA_DIR}security/role/default/roles.xml}
+ROLES_XML=${ROLES_XML:-${GEOSERVER_DATA_DIR}/security/role/default/roles.xml}
 echo "SETTING ROLES XML:" . $ROLES_XML
 
-CLASSPATH=$CATALINA_HOME/webapps/$APP_PATH_PREFIX"geoserver/WEB-INF/lib/"
+CLASSPATH=$CATALINA_HOME/webapps/$APP_PATH_PREFIX/geoserver/WEB-INF/lib/
 
 # tmp files
 TMP_USERS=/tmp/users.xml
@@ -68,4 +68,4 @@ else
     exit
 fi
 
-echo "... DONE updating GeoServer Credentials ..."
\ No newline at end of file
+echo "... DONE updating GeoServer Credentials ..."

From d339e3664859c2a5a2be8b932ec288621bb3475a Mon Sep 17 00:00:00 2001
From: Simon Seyock <seyock@terrestris.de>
Date: Thu, 18 Jul 2024 15:36:04 +0200
Subject: [PATCH 2/3] fix: remove app prefix

---
 update_credentials.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/update_credentials.sh b/update_credentials.sh
index 46f8695..3ac7575 100644
--- a/update_credentials.sh
+++ b/update_credentials.sh
@@ -11,16 +11,16 @@ fi;
 
 # copy over default security folder to data dir (if not existing)
 if [ ! -d "${GEOSERVER_DATA_DIR}/security" ]; then
-  cp -r ${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security" ${GEOSERVER_DATA_DIR}/
+  cp -r ${CATALINA_HOME}"/webapps/geoserver/data/security" ${GEOSERVER_DATA_DIR}/
 fi
 
 GEOSERVER_ADMIN_USER=${GEOSERVER_ADMIN_USER:-admin}
 GEOSERVER_ADMIN_PASSWORD=${GEOSERVER_ADMIN_PASSWORD:-geoserver}
 
 # templates to use as base for replacement
-USERS_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security/usergroup/default/users.xml"
+USERS_XML_ORIG=${CATALINA_HOME}"/webapps/geoserver/data/security/usergroup/default/users.xml"
 echo "USING USERS XML ORIGINAL:" $USERS_XML_ORIG
-ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security/role/default/roles.xml"
+ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/geoserver/data/security/role/default/roles.xml"
 echo "USING ROLES XML ORIGINAL:" $ROLES_XML_ORIG
 
 # final users.xml file GeoServer data dir
@@ -30,7 +30,7 @@ echo "SETTING USERS XML:" $USERS_XML
 ROLES_XML=${ROLES_XML:-${GEOSERVER_DATA_DIR}/security/role/default/roles.xml}
 echo "SETTING ROLES XML:" . $ROLES_XML
 
-CLASSPATH=$CATALINA_HOME/webapps/$APP_PATH_PREFIX/geoserver/WEB-INF/lib/
+CLASSPATH=$CATALINA_HOME/webapps/geoserver/WEB-INF/lib/
 
 # tmp files
 TMP_USERS=/tmp/users.xml

From e744800afdf15acb88880684925d6e763f78bc33 Mon Sep 17 00:00:00 2001
From: Simon Seyock <seyock@terrestris.de>
Date: Thu, 18 Jul 2024 15:40:41 +0200
Subject: [PATCH 3/3] fix: make quotes more useful

---
 update_credentials.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/update_credentials.sh b/update_credentials.sh
index 3ac7575..a0cc80e 100644
--- a/update_credentials.sh
+++ b/update_credentials.sh
@@ -11,26 +11,26 @@ fi;
 
 # copy over default security folder to data dir (if not existing)
 if [ ! -d "${GEOSERVER_DATA_DIR}/security" ]; then
-  cp -r ${CATALINA_HOME}"/webapps/geoserver/data/security" ${GEOSERVER_DATA_DIR}/
+  cp -r "${CATALINA_HOME}/webapps/geoserver/data/security" "${GEOSERVER_DATA_DIR}/"
 fi
 
 GEOSERVER_ADMIN_USER=${GEOSERVER_ADMIN_USER:-admin}
 GEOSERVER_ADMIN_PASSWORD=${GEOSERVER_ADMIN_PASSWORD:-geoserver}
 
 # templates to use as base for replacement
-USERS_XML_ORIG=${CATALINA_HOME}"/webapps/geoserver/data/security/usergroup/default/users.xml"
+USERS_XML_ORIG="${CATALINA_HOME}/webapps/geoserver/data/security/usergroup/default/users.xml"
 echo "USING USERS XML ORIGINAL:" $USERS_XML_ORIG
-ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/geoserver/data/security/role/default/roles.xml"
+ROLES_XML_ORIG="${CATALINA_HOME}/webapps/geoserver/data/security/role/default/roles.xml"
 echo "USING ROLES XML ORIGINAL:" $ROLES_XML_ORIG
 
 # final users.xml file GeoServer data dir
-USERS_XML=${USERS_XML:-${GEOSERVER_DATA_DIR}/security/usergroup/default/users.xml}
+USERS_XML=${USERS_XML:-"${GEOSERVER_DATA_DIR}/security/usergroup/default/users.xml"}
 echo "SETTING USERS XML:" $USERS_XML
 # final roles.xml file GeoServer data dir
-ROLES_XML=${ROLES_XML:-${GEOSERVER_DATA_DIR}/security/role/default/roles.xml}
+ROLES_XML=${ROLES_XML:-"${GEOSERVER_DATA_DIR}/security/role/default/roles.xml"}
 echo "SETTING ROLES XML:" . $ROLES_XML
 
-CLASSPATH=$CATALINA_HOME/webapps/geoserver/WEB-INF/lib/
+CLASSPATH="$CATALINA_HOME/webapps/geoserver/WEB-INF/lib/"
 
 # tmp files
 TMP_USERS=/tmp/users.xml