[java-idp-plugin-jetty] 02/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=ef42f7311f728fea9034dae97784a4245f4a271d

commit ef42f7311f728fea9034dae97784a4245f4a271d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Sep 8 16:12:01 2025 +0100

    JJETTY-21 DownloadXXX needs to be able to take more that one parameter
    
    https://shibboleth.atlassian.net/browse/JJETTY-21
    
    Fix for Windows
---
 .../main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat | 5 ++++-
 .../resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat    | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat
index b7fb3b8..f240da7 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat
@@ -20,5 +20,8 @@ if "%VERSION%" EQU "" (
 
 set CLASSPATH=%~dp0\net.shibboleth.idp.jetty-base\jetty-cli.jar
 
-runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI -v %VERSION%
+REM Magickto strip the rest of the parameters
+for /f "tokens=1,* delims= " %%a in ("%*") do set ALL_BUT_FIRST=%%b
+
+"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI -v %VERSION% %ALL_BUT_FIRST%
 
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat
index 122b5c8..4827e82 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat
@@ -22,6 +22,8 @@ SET MAVEN_ARGS=--type zip --classifier bin-windows --groupId commons-daemon --ar
 
 set CLASSPATH=%~dp0\net.shibboleth.idp.jetty-base\jetty-cli.jar
 
+REM Strip the rest of the parameters
+for /f "tokens=1,* delims= " %%a in ("%*") do set ALL_BUT_FIRST=%%b
 
-runclass -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI %MAVEN_ARGS%
+"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI %MAVEN_ARGS% %ALL_BUT_FIRST%
 

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