[java-idp-plugin-jetty] branch main updated: 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=3784ae8d5218a1b324a467b38d638291631fce54

The following commit(s) were added to refs/heads/main by this push:
     new 3784ae8  JJETTY-21 DownloadXXX needs to be able to take more that one parameter
3784ae8 is described below

commit 3784ae8d5218a1b324a467b38d638291631fce54
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Sep 8 16:22:50 2025 +0100

    JJETTY-21 DownloadXXX needs to be able to take more that one parameter
    
    https://shibboleth.atlassian.net/browse/JJETTY-21
    
    Add --home to the download batch files
---
 .../main/resources/net/shibboleth/idp/module/jetty/downloadjetty.bat  | 4 ++--
 .../main/resources/net/shibboleth/idp/module/jetty/downloadjetty.sh   | 2 +-
 .../resources/net/shibboleth/idp/module/jetty/downloadprocrun.bat     | 2 +-
 3 files changed, 4 insertions(+), 4 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 f240da7..68ed6d0 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,8 +20,8 @@ if "%VERSION%" EQU "" (
 
 set CLASSPATH=%~dp0\net.shibboleth.idp.jetty-base\jetty-cli.jar
 
-REM Magickto strip the rest of the parameters
+REM 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%
+"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI  --home "%~dp0\.." -v %VERSION% %ALL_BUT_FIRST%
 
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 5df9279..a76cfcd 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
@@ -22,5 +22,5 @@ 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 -v $VERSION
+$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
 
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 4827e82..5798ca9 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
@@ -25,5 +25,5 @@ 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
 
-"%~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%
+"%~dp0\runclass.bat" -Dnet.shibboleth.idp.cli.arguments=net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadArugments net.shibboleth.idp.plugin.jetty.cli.impl.JettyDownloadCLI --home "%~dp0\.." %MAVEN_ARGS% %ALL_BUT_FIRST%
 

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