X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=msi%2Fscripts%2Fshib_edit_config_files.vbs;h=21c3bbf58c6b0ab50b15b95a7672441e055f20f1;hb=beb403d92a9b605f071b10bfe647344676e439b4;hp=f8ffbbc663d7879f9c578e77779b7081cee5ee5b;hpb=19986e56ba152aaeffed32def6177edd75dbadc7;p=shibboleth%2Fsp.git
diff --git a/msi/scripts/shib_edit_config_files.vbs b/msi/scripts/shib_edit_config_files.vbs
index f8ffbbc..21c3bbf 100644
--- a/msi/scripts/shib_edit_config_files.vbs
+++ b/msi/scripts/shib_edit_config_files.vbs
@@ -80,22 +80,10 @@ if (Err = 0) then
End If
FileSystemObj.MoveFile ConfigFile, DistDir & "attribute-policy.xml"
- ConfigFile = DistDir & "example-metadata.xml.in"
- ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "example-metadata.xml")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "example-metadata.xml", false
- End If
- If (FileSystemObj.FileExists(DistDir & "example-metadata.xml")) then
- FileSystemObj.DeleteFile DistDir & "example-metadata.xml", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "example-metadata.xml"
-
ConfigFile = DistDir & "shibboleth2.xml.in"
ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth"
ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"
- ReplaceInFile ConfigFile, "@-LOGDIR-@", ConvertedDir & "/var/log/shibboleth"
- ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
ReplaceInFile ConfigFile, " ", ""
ReplaceInFile ConfigFile, "", ""
If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then
@@ -224,6 +212,10 @@ if (Err = 0) then
FileSystemObj.CopyFile DistDir & "sp-example.key", ConfigDir, false
End If
+ If (NOT FileSystemObj.FileExists(ConfigDir & "example-metadata.xml")) then
+ FileSystemObj.CopyFile DistDir & "example-metadata.xml", ConfigDir, false
+ End If
+
' Finally, fix up schema catalogs.
XMLDir = InstallDir & "\share\xml\xmltooling\"