[java-identity-provider] branch master updated: IDP-1193 Strip jetty\demo-base from jetty distribution

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d094d35a87edccf148fe09797c6c4b8ccfbc9b56

The following commit(s) were added to refs/heads/master by this push:
       new  d094d35   IDP-1193 Strip jetty\demo-base from jetty distribution
d094d35 is described below

commit d094d35a87edccf148fe09797c6c4b8ccfbc9b56
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 18 13:32:05 2017 +0100

    IDP-1193 Strip jetty\demo-base from jetty distribution
    
    https://issues.shibboleth.net/jira/browse/IDP-1193
---
 idp-installer/src/main/wix/Jetty.bat | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/wix/Jetty.bat b/idp-installer/src/main/wix/Jetty.bat
index ee8b7d7..1374379 100644
--- a/idp-installer/src/main/wix/Jetty.bat
+++ b/idp-installer/src/main/wix/Jetty.bat
@@ -1,4 +1,4 @@
- at Echo off
+rem @Echo off
 REM Generate msm
 setlocal
 
@@ -97,7 +97,7 @@ if not exist "%2".asc (
 
 gpg --verify %2.asc %2
 if ERRORLEVEL 1 (
-   echo Error: Signature check failed on %1%
+   echo Error: Signature check failed on %2%
    goto done
 )
 
@@ -118,8 +118,10 @@ if ERRORLEVEL 1 (
 cd ..
 
 REM Extract Jetty
+REM IDP-1193 - and kill off demo-base
 
 for /D %%X in (jetty-extract/*) do set jex=%%X
+rd /s /q jetty-extract\%jex%\demo-base
 echo %jex% 1> jetty-extract/%jex%/JETTY_VERSION.TXT
 "%WIX%/BIN/HEAT"  dir jetty-extract\%Jex% -platform -gg -dr JETTYROOT -var var.JettySrc -cg JettyGroup -out jetty_contents.wxs -nologo -srd
 if ERRORLEVEL 1 goto done

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