[java-idp-plugin-jetty] branch main updated: JJETTY-22 Eschew %dp.. in setting jetty paths

[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:
https://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=9eadf2155004b35c086aa49e37229b7c6778669d

The following commit(s) were added to refs/heads/main by this push:
     new 9eadf21  JJETTY-22 Eschew %dp.. in setting jetty paths
9eadf21 is described below

commit 9eadf2155004b35c086aa49e37229b7c6778669d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 5 15:31:28 2025 +0000

    JJETTY-22 Eschew %dp.. in setting jetty paths
    
    https://shibboleth.atlassian.net/browse/JJETTY-22
    
    Do a little dance to get an IDP_HOME with no '../' bits in the
    three bat files where that matters.
---
 .../resources/net/shibboleth/idp/module/jetty/config-jetty.bat | 10 ++++++++--
 .../resources/net/shibboleth/idp/module/jetty/runjetty.bat     |  7 ++++++-
 .../resources/net/shibboleth/idp/module/jetty/setjettybase.bat |  7 ++++++-
 .../net/shibboleth/idp/module/jetty/setjettyversion.bat        |  7 ++++++-
 .../net/shibboleth/idp/module/jetty/setprocrunversion.bat      |  8 +++++++-
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
index 29eb142..7bbba0c 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/config-jetty.bat
@@ -11,7 +11,13 @@ if not defined JAVA_HOME  (
   exit /b
 )
 
-set IDP_HOME_WINDOWS=%~dp0..
+
+set SAVE_WORKING_DIR_CONFIG_JETTY=%cd%
+cd /d %~dp0..
+set IDP_HOME_WINDOWS=%cd%
+cd /d %SAVE_WORKING_DIR_CONFIG_JETTY%
+set SAVE_WORKING_DIR_CONFIG_JETTY=
+
 set IDP_HOME_UNIX=%IDP_HOME_WINDOWS:\=/%
 set JETTY_TMP=%IDP_HOME_WINDOWS%\jetty-dist\jetty-tmp
 set PRUNSRV=%PROCRUN_HOME%\amd64\prunsrv.exe
@@ -161,7 +167,7 @@ if ERRORLEVEL 1 (
    exit /b
 )
 
-echo Setting FULL ACL on %~dp0..jetty-dist\jetty-tmp content for SYSTEM, Administrators and %USERNAME%
+echo Setting FULL ACL on %JETTY_TMP% content for SYSTEM, Administrators and %USERNAME%
 icacls "%JETTY_TMP%" /t /inheritance:r /grant:r SYSTEM:F Administrators:F "%USERNAME%:F" /q
 if ERRORLEVEL 1 (
   echo Error: Could not set ACL
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
index 414df08..674b2c9 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/runjetty.bat
@@ -16,7 +16,12 @@ if not exist %JAVACMD% (
   exit /b
 )
 
-set IDP_HOME_WINDOWS=%~dp0..
+set SAVE_WORKING_DIR_RUN_JETTY=%cd%
+cd /d %~dp0..
+set IDP_HOME_WINDOWS=%cd%
+cd /d %SAVE_WORKING_DIR_RUN_JETTY%
+set SAVE_WORKING_DIR_RUN_JETTY=
+
 SET IDP_HOME_UNIX=%IDP_HOME_WINDOWS:\=/%
 SET JETTY_TMP=%IDP_HOME_WINDOWS%\jetty-dist\jetty-tmp
 
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.bat
index 1bb6cfb..ea4e210 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettybase.bat
@@ -1,6 +1,11 @@
 @echo off
 
-set IDP_HOME_WINDOWS=%~dp0..
+set SAVE_WORKING_DIR_SET_JETTYBASE=%cd%
+cd /d %~dp0..
+set IDP_HOME_WINDOWS=%cd%
+cd /d %SAVE_WORKING_DIR_SET_JETTYBASE%
+set SAVE_WORKING_DIR_SET_JETTYBASE=
+
 if not exist %IDP_HOME_WINDOWS%\jetty-base-%1% (
    echo Error: jetty-base-%1% not installed
    exit /b
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.bat
index e0c7cae..0929c87 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setjettyversion.bat
@@ -1,6 +1,11 @@
 @echo off
 
-set IDP_HOME_WINDOWS=%~dp0..
+set SAVE_WORKING_DIR_SET_JETTY_VERSION=%cd%
+cd /d %~dp0..
+set IDP_HOME_WINDOWS=%cd%
+cd /d %SAVE_WORKING_DIR_SET_JETTY_VERSION%
+set SAVE_WORKING_DIR_SET_JETTY_VERSION=%cd%
+
 if not exist %IDP_HOME_WINDOWS%\jetty-dist\jetty-home-%1% (
    echo Error: Jetty version %1% has not be downloaded and unpacked
    exit /b
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setprocrunversion.bat b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setprocrunversion.bat
index b2a0355..2cba64a 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setprocrunversion.bat
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/setprocrunversion.bat
@@ -1,6 +1,12 @@
 @echo off
 
-set IDP_HOME_WINDOWS=%~dp0..
+set SAVE_WORKING_DIR_SET_PROCRUN_VERSION=%cd%
+cd /d %~dp0..
+set IDP_HOME_WINDOWS=%cd%
+cd /d %SAVE_WORKING_DIR_SET_PROCRUN_VERSION%
+set SAVE_WORKING_DIR_SET_PROCRUN_VERSION=%cd%
+
+
 if not exist %IDP_HOME_WINDOWS%\jetty-dist\commons-daemon-%1% (
    echo Error: Procrun version %1% has not be downloaded and unpacked
    exit /b

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