From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 6 Sep 2012 21:05:07 +0000 (+0000)
Subject: Final? fixes for SSPCPP-498
X-Git-Tag: 2.5.1~69
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=f983fee65cc2323a495597d61071eb3b6c498547;hp=4559a0adef649a13669e7e491f56b77e0937472d;p=shibboleth%2Fcpp-sp.git

Final? fixes for SSPCPP-498
---

diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 87317eb..bfab312 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -225,13 +225,13 @@
     <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
       Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml10-catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml11-catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml20-catalog.xml' />
     <InstallExecuteSequence>
       <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 1908edc..57132ad 100644
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -72,7 +72,7 @@
     <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
                   Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' 
-                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />
+                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\catalog.xml' />
     <InstallExecuteSequence>
       <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>
diff --git a/msi/scripts/shib_edit_catalog.vbs b/msi/scripts/shib_edit_catalog.vbs
index b30dff6..2b21bf5 100644
--- a/msi/scripts/shib_edit_catalog.vbs
+++ b/msi/scripts/shib_edit_catalog.vbs
@@ -45,9 +45,8 @@ if (Err = 0) then
   customData = Session.Property("CustomActionData")
   msiProperties = split(customData,";@;")
   XMLDir = msiProperties(0) ' \programdata\shibboleth\sp\xml\opensaml\
-  ConfigFileName = msiProperties(1) 'catalog
+  ConfigFile = msiProperties(1) 'catalog
 
-  ConfigFile = XMLDir & ConfigFileName
   ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
 
 'Last End If