[WinOF] InstallShield - perserve existing %SystemDrive%\DAT\dat.conf

git-svn-id: svn://openib.tc.cornell.edu/gen1@777 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WinOF/InstallShield/CustomActions.vbs b/branches/WinOF/InstallShield/CustomActions.vbs
index 18f56c4878dd4b8a6aaded10de975b8754447d62..0d53fe79f038fe61390560074b649c53a16273e7 100644 (file)
--- a/branches/WinOF/InstallShield/CustomActions.vbs
+++ b/branches/WinOF/InstallShield/CustomActions.vbs
@@ -764,7 +764,7 @@ End Sub
 \r
 \r
 Sub DAPLsetup()\r
-      Dim sSysDrive, DatFolder, SrcFile, WshShell, fso\r
+      Dim sSysDrive, DstFile, SrcFile, WshShell, fso\r
 \r
       Set WshShell = CreateObject("WScript.Shell")\r
       Set fso = CreateObject("Scripting.FileSystemObject")\r
@@ -774,18 +774,12 @@ Sub DAPLsetup()
       If fso.FileExists(SrcFile) Then\r
              On Error Resume Next \r
           sSysDrive = WshShell.ExpandEnvironmentStrings("%SystemDrive%") \r
-          DatFolder = sSysDrive & "\DAT"\r
-          If fso.FolderExists(DatFolder) Then\r
-              ' Preserve existing %SystemDrive%\DAT\r
+          DstFile = sSysDrive & "\DAT\dat.conf"\r
+          If fso.FileExists(DstFile) Then\r
+              ' Preserve existing %SystemDrive%\DAT\dat.conf\r
               Exit Sub\r
           End if\r
-          ' create %SystemDrive%\DAT & install dat.conf\r
-          fso.CreateFolder DatFolder\r
-          If Err Then\r
-              ErrMsg "Unable to create folder %SystemDrive%\DAT"\r
-              Exit Sub\r
-          End if\r
-          fso.CopyFile SrcFile, DatFolder & "\dat.conf"\r
+          fso.CopyFile SrcFile, DstFile\r
       End if\r
 End Sub\r
 \r