From 1186c576081efc98d96ad36291116d955b9b4389 Mon Sep 17 00:00:00 2001
From: Simon Hofer <simon.hofer@sbnet.ch>
Date: Wed, 2 Oct 2024 07:23:07 +0200
Subject: [PATCH] GEOS-11555: fix slashes and docs

---
 README.md             | 7 ++++---
 install-extensions.sh | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0f94829..fc288e5 100644
--- a/README.md
+++ b/README.md
@@ -246,8 +246,8 @@ Following is the list of the all the environment variables that can be passed do
 | STABLE_EXTENSIONS | Specifies stable GeoServer extensions | |
 | STABLE_PLUGIN_URL | Specifies the URL for downloading the latest stable GeoServer plugins | `https://build.geoserver.org/geoserver/2.25.x/ext-latest` |
 | COMMUNITY_EXTENSIONS | Specifies community-contributed GeoServer extensions | |
-| COMMUNITY_PLUGIN_BASE_URL | Specifies the **base** URL for downloading the latest community-contributed GeoServer plugins. | `https://build.geoserver.org/geoserver/` | |
-| COMMUNITY_PLUGIN_URL | Specifies the URL for downloading the latest community-contributed GeoServer plugins | `${COMMUNITY_PLUGIN_BASE_URL}2.25.x/community-latest` |
+| COMMUNITY_PLUGIN_BASE_URL | Specifies the **base** URL for downloading the latest community-contributed GeoServer plugins. | `https://build.geoserver.org/geoserver` | |
+| COMMUNITY_PLUGIN_URL | Specifies the URL for downloading the latest community-contributed GeoServer plugins defaults to `${COMMUNITY_PLUGIN_BASE_URL}/${GEOSERVER_RELEASE_BRANCH}/community-latest` |
 | ADDITIONAL_LIBS_DIR | Sets the directory for additional libraries used by GeoServer | `/opt/additional_libs/` |
 | ADDITIONAL_FONTS_DIR | Sets the directory for additional fonts used by GeoServer | `/opt/additional_fonts/` |
 | SKIP_DEMO_DATA | Indicates whether to skip the installation of demo data provided by GeoServer | `false` |
@@ -255,8 +255,9 @@ Following is the list of the all the environment variables that can be passed do
 | HEALTHCHECK_URL | URL to the resource / endpoint used for `docker` health checks | `http://localhost:8080/geoserver/web/wicket/resource/org.geoserver.web.GeoServerBasePage/img/logo.png` |
 | GEOSERVER_ADMIN_USER | Admin username |   |
 | GEOSERVER_ADMIN_PASSWORD | Admin password |  |
-| WGET_OPTS | Options for the `wget` command | `--no-check-certificate` |
+| WGET_OPTS | Options for the `wget` command in case you need some (unset by default)| `--no-check-certificate` |
 | GEOSERVER_VERSION | Geoserver version (used internally) | `2.24-SNAPSHOT`|
+| GEOSERVER_RELEASE_BRANCH | Geoserver release branch (used internally) is derived from GEOSERVER_VERSION | `2.24.x` or `main` |
 | GEOSERVER_BUILD | Geoserver build (used internally) must not be changed| `1628` |
 
 ## Troubleshooting
diff --git a/install-extensions.sh b/install-extensions.sh
index c2cb90b..209f7c8 100755
--- a/install-extensions.sh
+++ b/install-extensions.sh
@@ -52,13 +52,13 @@ if [ "$DOWNLOAD_EXTENSIONS" = "true" ]; then
       COMMUNITY_EXTENSIONS_VERSION="${GEOSERVER_VERSION/-SNAPSHOT/.x}"
       COMMUNITY_EXTENSIONS_VERSION="${COMMUNITY_EXTENSIONS_VERSION%.*}-SNAPSHOT"
     fi
-    COMMUNITY_PLUGIN_BASE_URL=${COMMUNITY_PLUGIN_BASE_URL:-"https://build.geoserver.org/geoserver/"}
+    COMMUNITY_PLUGIN_BASE_URL=${COMMUNITY_PLUGIN_BASE_URL:-"https://build.geoserver.org/geoserver"}
     if [ -z "$GEOSERVER_RELEASE_BRANCH" ]; then
       GEOSERVER_RELEASE_BRANCH="${GEOSERVER_VERSION/-SNAPSHOT/.x}"
       GEOSERVER_RELEASE_BRANCH="${GEOSERVER_RELEASE_BRANCH%.*}.x"
 
     fi
-    COMMUNITY_PLUGIN_URL=${COMMUNITY_PLUGIN_URL:-"${COMMUNITY_PLUGIN_BASE_URL}${GEOSERVER_RELEASE_BRANCH}/community-latest/"}
+    COMMUNITY_PLUGIN_URL=${COMMUNITY_PLUGIN_URL:-"${COMMUNITY_PLUGIN_BASE_URL}/${GEOSERVER_RELEASE_BRANCH}/community-latest/"}
 
     echo "installing community modules from COMMUNITY_PLUGIN_URL=${COMMUNITY_PLUGIN_URL} with GEOSERVER_RELEASE_BRANCH=${GEOSERVER_RELEASE_BRANCH} and COMMUNITY_EXTENSIONS_VERSION=${COMMUNITY_EXTENSIONS_VERSION} from GEOSERVER_VERSION=${GEOSERVER_VERSION}"
 
@@ -66,6 +66,8 @@ if [ "$DOWNLOAD_EXTENSIONS" = "true" ]; then
 
     for EXTENSION in $(echo "${COMMUNITY_EXTENSIONS}" | tr ',' ' '); do
       URL="${COMMUNITY_PLUGIN_URL}/geoserver-${COMMUNITY_EXTENSIONS_VERSION}-${EXTENSION}-plugin.zip"
+      # remove double slashes
+      URL=${URL/\/\//\/}
       download_extension ${URL} ${EXTENSION} ${COMMUNITY_EXTENSIONS_VERSION}
     done
   fi