From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Fri, 2 Nov 2012 16:32:59 +0000 (+0000)
Subject: SSPCPP-521 - Restore latest version of file.
X-Git-Tag: 2.5.1~17
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=8bd7d3bde41de04a80cb32e1dcdcce9312fe2542

SSPCPP-521 - Restore latest version of file.

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

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