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

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index d3877c4..b75a4c2 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -174,7 +174,7 @@
 \r
     <CustomAction Id='EditConfigFiles' \r
                   BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR]' />\r
+    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[IS64BITINSTALL];@;[INSTALL_32BIT]' />\r
 \r
     <CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />\r
     <CustomAction Id='SetKeyGen' Property='KeyGen' Value='&quot;[INSTALLDIR]etc\shibboleth\keygen.bat&quot;' />\r

diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
index 1165ee3..0d232b3 100644 (file)
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ b/msi/scripts/shib_edit_config_files.vbs-wix
@@ -36,22 +36,30 @@ End Sub
 \r
 \r
 Dim FileSystemObj, ConvertedDir, ConfigFile, XMLDir, WshShell\r
-Dim customData, msiProperties, InstallDir, ShibdPort, LogFile\r
+Dim customData, msiProperties, InstallDir, LibDir, Is64Bit, Install32, LogFile\r
 \r
 on error resume next\r
 Set FileSystemObj = CreateObject("Scripting.FileSystemObject")\r
 if (Err = 0) then\r
 \r
-  'Get the INSTALLDIR and SHIBD_PORT values via CustomActionData\r
+  'Get the INSTALLDIR and 64/32 values via CustomActionData\r
   customData = Session.Property("CustomActionData")\r
   msiProperties = split(customData,";@;")\r
   InstallDir = msiProperties(0)\r
-  ShibdPort = msiProperties(1)\r
+  Is64Bit = msiProperties(1)\r
+  Install32 = msiProperties(2)\r
+\r
+  LibDir = "lib"\r
+  If (Is64Bit = "TRUE") then\r
+      If (Install32 <> "TRUE") then\r
+          LibDir = "lib64"\r
+      End If\r
+  End If\r
 \r
   Set LogFile = FileSystemObj.OpenTextFile(InstallDir & "\var\log\shibboleth\Installer.log", 8, true)\r
 \r
   If (LogFile) then\r
-     LogFile.WriteLine "Edit Config Files to " & InstallDir & ", Port = " & ShibdPort\r
+     LogFile.WriteLine "Edit Config Files to " & InstallDir & ", 64Bit = " & Is64Bit & ", 32Bit = " & Install32\r
   End If\r
 \r
   'Remove all trailing backslashes to normalize\r
@@ -91,8 +99,8 @@ if (Err = 0) then
   FileSystemObj.MoveFile ConfigFile, DistDir & "native.logger"\r
 \r
   ConfigFile = DistDir & "apache.config.in"\r
-  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"\r
-  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"\r
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache.config")) then\r
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache.config", false\r
   End If\r
@@ -102,8 +110,8 @@ if (Err = 0) then
   FileSystemObj.MoveFile ConfigFile, DistDir & "apache.config"\r
 \r
   ConfigFile = DistDir & "apache2.config.in"\r
-  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"\r
-  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"\r
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache2.config")) then\r
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache2.config", false\r
   End If\r
@@ -113,8 +121,8 @@ if (Err = 0) then
   FileSystemObj.MoveFile ConfigFile, DistDir & "apache2.config"\r
 \r
   ConfigFile = DistDir & "apache22.config.in"\r
-  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"\r
-  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"\r
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache22.config")) then\r
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache22.config", false\r
   End If\r
@@ -124,8 +132,8 @@ if (Err = 0) then
   FileSystemObj.MoveFile ConfigFile, DistDir & "apache22.config"\r
 \r
   ConfigFile = DistDir & "apache24.config.in"\r
-  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"\r
-  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"\r
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache24.config")) then\r
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache24.config", false\r
   End If\r