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 (file)
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -225,13 +225,13 @@
     <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
       Execute='deferred' Impersonate='no' />\r
     <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'\r
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />\r
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\catalog.xml' />\r
     <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'\r
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />\r
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml10-catalog.xml' />\r
     <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'\r
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />\r
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml11-catalog.xml' />\r
     <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'\r
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />\r
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml20-catalog.xml' />\r
     <InstallExecuteSequence>\r
       <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
       <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>\r

diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 1908edc..57132ad 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -72,7 +72,7 @@
     <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
                   Execute='deferred' Impersonate='no' />\r
     <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' \r
-                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />\r
+                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\catalog.xml' />\r
     <InstallExecuteSequence>\r
       <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
       <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>\r

diff --git a/msi/scripts/shib_edit_catalog.vbs b/msi/scripts/shib_edit_catalog.vbs
index b30dff6..2b21bf5 100644 (file)
--- 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")\r
   msiProperties = split(customData,";@;")\r
   XMLDir = msiProperties(0) ' \programdata\shibboleth\sp\xml\opensaml\\r
-  ConfigFileName = msiProperties(1) 'catalog\r
+  ConfigFile = msiProperties(1) 'catalog\r
 \r
-  ConfigFile = XMLDir & ConfigFileName\r
   ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir\r
 \r
 'Last End If\r