https://issues.shibboleth.net/jira/browse/SSPCPP-521

Restore latest version of file.

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3818 cb58f699-b61c-0410-a6fe-9272a202ed29

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