[java-idp-plugin-jetty] 02/03: mmm

[Rod Widdowson]

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

rdw pushed a commit to branch dev/BatfileWIP
in repository java-idp-plugin-jetty.

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

commit d960fab6bf4f350c722ef1a1afa580efefd0ca85
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Aug 2 13:21:03 2025 +0100

    mmm
---
 .../net/shibboleth/idp/module/jetty/setjettybase.bat     | 16 +++++++++-------
 .../shibboleth/idp/module/jetty/setprocrunversion.bat    | 14 ++++++++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

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 a28d710..78c01b9 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
@@ -11,12 +11,18 @@ set JETTY_TMP=%IDP_HOME_WINDOWS%\jetty-dist\jetty-tmp
 set PRUNSRV=%PROCRUN_HOME%\amd64\prunsrv.exe
 set JETTY_BASE=%IDP_HOME_WINDOWS%\jetty-base-%1%
 setx /m JETTY_BASE %JETTY_BASE%
-
-if not exist %PRUNSRV% goto no_service
+echo JETTY_BASE set to be %JETTY_BASE%
 
 sc qc shibd_idp >nl:
 
-if not errorlevel 0 goto no_service
+REM below reads if error level > 0 then ....
+if errorlevel 0 (
+(
+   echo Procrun not installed, skipping further configuration
+   exit /b
+)
+
+setlocal
 
 SET PORTPASS=%random%-%random%-%random%-%random%
 
@@ -32,8 +38,4 @@ SET PR_STOPPARAMS=--stop;%PR_STARTPARAMS%
 
 %PRUNSRV%  //US/Shibd_idp
 
-
-:no_service
-
-echo JETTY_BASE set to be %JETTY_BASE%
 echo Restart shibd_idp to start using this version
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 d4fa587..24445e0 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,5 @@
 @echo off
 
-
 set IDP_HOME_WINDOWS=%~dp0..
 if not exist %IDP_HOME_WINDOWS%\jetty-dist\commons-daemon-%1% (
    echo Error: Procrun version %1% has not be downloaded and unpacked
@@ -10,9 +9,16 @@ if not exist %IDP_HOME_WINDOWS%\jetty-dist\commons-daemon-%1% (
 set PROCRUN_HOME=%IDP_HOME_WINDOWS%\jetty-dist\commons-daemon-%1%
 setx /m PROCRUN_HOME %PROCRUN_HOME%
 
-sc config shibd_idp binpath="%procrun_home%amd64\prunsrv.exe //RS//Shibd_idp  > nl:
+echo "PROCRUN_HOME set to be %PROCRUN_HOME%"
+
+sc qc shibd_idp > nl:
 
-echo PROCRUN_HOME set to be %PROCRUN_HOME%"
-echo Restart shibd_idp to start using this version"
+if NOT ERRORLEVEL 0 (
+       
+   sc config shibd_idp binpath="%procrun_home%amd64\prunsrv.exe //RS//Shibd_idp
+   echo Restart shibd_idp to start using this version"
+)  else (
+echo NOTE shibd_idp service has not been configured yet
+)
 
 

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