[shibboleth-sp2] 51/82: SSPCPP-737 Bug fixes In the speicalized installer

[Etienne Dysli Metref]

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

edm-guest pushed a commit to branch master
in repository shibboleth-sp2.

commit 9f339128a2a709269f58f267c171412b40e44679
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Fri Jul 28 16:44:58 2017 +0100

    SSPCPP-737 Bug fixes In the speicalized installer
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-737
    
    1) Allow uninstaling to work (the upgrade table isn't looked at in
       an uninstall so FOUNDSHIB wasnt being set
    2) Quote the uninstall script correctly
    3) Add a test against IISV6
---
 msi/WiX/IIsNatve.wxs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/msi/WiX/IIsNatve.wxs b/msi/WiX/IIsNatve.wxs
index 2b29fe5..35af255 100644
--- a/msi/WiX/IIsNatve.wxs
+++ b/msi/WiX/IIsNatve.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
     <Product Id="*" Name="Shibboleth IIS native server support: Downlevel installer " Language="1033" 
-                Version="0.0.1.255" Manufacturer="Shibboleth Consortium" 
+                Version="0.1.0.0" Manufacturer="Shibboleth Consortium"
                 UpgradeCode="5d2542f1-deb7-41ef-a20f-4f85e5f66a71">
 	    <Package Description="IISNative DownLevel Installer" InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Platform="x64" />
 
@@ -12,8 +12,9 @@
         <Upgrade Id="$(var.ShibbolethUpgradeCode)">
             <UpgradeVersion Property="FOUNDSHIB" Minimum="2.6.0.0"  Maximum="2.7.0.0" OnlyDetect="yes"/>
         </Upgrade>
-        <Condition Message="Existing Shibboleth Installation not found">FOUNDSHIB</Condition>
+        <Condition Message="Existing Shibboleth Installation not found">FOUNDSHIB OR Installed</Condition>
         <Condition Message="IIS Not Found">IISMAJORVERSION</Condition>
+        <Condition Message="Requries IIS7 or later">IISMAJORVERSION <> "#6"</Condition>
         <Condition Message="Install Dir Not Found">INSTALLDIR</Condition>
 
         <Feature Id="IIsNative" Title="IisNative" Level="1">
@@ -78,7 +79,7 @@
         <CustomAction Id="QtInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 
         <CustomAction Id="SetQtUninstall" Property="QtUninstall"
-            Value="[%systemroot]\system32\inetsrv\appcmd.exe uninstall module ShibNative" />
+            Value=""[%systemroot]\system32\inetsrv\appcmd.exe" uninstall module ShibNative" />
         <CustomAction Id="QtUninstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
 
         <InstallExecuteSequence>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git