From e744800afdf15acb88880684925d6e763f78bc33 Mon Sep 17 00:00:00 2001 From: Simon Seyock Date: Thu, 18 Jul 2024 15:40:41 +0200 Subject: [PATCH] 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