[java-idp-plugin-jetty] 01/02: JJETTY-21 DownloadXXX needs to be able to take more that one parameter

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-idp-plugin-jetty.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=c37fd6f51376c832b1b3802df9d9f36999b12a2b

commit c37fd6f51376c832b1b3802df9d9f36999b12a2b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Sep 16 16:24:45 2025 +0100

    JJETTY-21 DownloadXXX needs to be able to take more that one parameter
    
    https://shibboleth.atlassian.net/browse/JJETTY-21
    
    Collect patch to downloadjetty.sh as suggested by StevenP.
---
 .../net/shibboleth/idp/module/jetty/downloadjetty.sh     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.sh b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.sh
index a76cfcd..d531d41 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.sh
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.sh
@@ -17,10 +17,16 @@ if [ -e "$LOCATION/jetty-dist/jetty-home-$1" ] ; then
   exit 1
 fi
 
-VERSION=$1
-while [ -z $VERSION ] ; do
-    read -p "Jetty version to download: " VERSION
-done
 
-$LOCATION/runclass.sh -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI --home "$LOCATION/.." -v $VERSION
+VERSION=""
+if [ "$#" -ge "1" -a "${1:0:1}" != "-" ] ; then
+    VERSION="-v $1"
+    shift
+elif [ "$#" -eq "0" ] ; then
+    while [ -z "$VERSION" ] ; do
+        read -p "Jetty version to download: " VERSION
+        VERSION="-v $VERSION"
+    done
+fi
 
+$LOCATION/runclass.sh -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI --home "$LOCATION/.." ${VERSION} "$@"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.