From 94c9dc84a93e98afb7db6fd4e0ec5ddb3d1c4bb3 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Thu, 11 Nov 2004 22:05:21 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=4528
---
 win_build/installerv2/BOINC.ism               | Bin 202240 -> 202672 bytes
 .../redist/Windows/Accounts_CopyFiles.vbs     |  58 ++++++++++++++----
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index a4d43c56f6ba60da91cba72fd532b635aaf88dc5..9d502f9d3377bf93b7cb989e79a8594f68cd8281 100644
GIT binary patch
delta 786
zcmZ8fO-vI(6yBMgg(6*`<wpaiE|{pPrcelCFb10z5=^CJ3xtG{T9y?zEN!!$A`qh(
zqk{3a(S^hVc&H%~ZEUjZ#b}}-oHSGq96;dU!Js`DB6typMm%`<=Dlye_a<+?yzzN+
z^0_%Fqnt~x`g5umQwrjd2~iYPPM}?%1}9QmCLhWJwS<@K->I1WpuT0CDO`XUXn&a+
zD_*}1`cpmAYq`LjIy*a8lV_m-Whbzx-<O`K3+X~jn|ReLg$G5&EA=TMWz?xYO;>Py
zM}Y8v6jQJx(kK64RGV5&TPhxBkTo2_aYbwo;VT@DaDu2vFMeby5(NNRrOT42IJkC2
z8Y1s<gW{-e1(~CX(*Wi9McLIC6T?`u)Ppi@CJh<G+6Yz(^$TEPi~$ri4z;ECpjxd#
z$awP(i~-wcmZB`CF3?3(p5d8JhN8NeJ@$oNWsU9y(8%Vmv0vFu_8C1#&ugJsP;4YW
zf*lsz(dITl6S_r;jc*&E<cyVk$uBCyk|4H*V>l$sPQ4svXx#=E5wh=lYHU?ObETT(
zOAXosH**tSh^%CIQNU6p?2!k8?syDG^mdpzo*04XfGaC-J$1e6O^3}Wy9Sq!Bp#8b
zMy|)%>uB}(gUvke<AcsxeFkRg5}zQ_s#al@QM3#vZO39Fjz=AGWWep=eHTIYbO}Nv
z9>%etI}#mjkz_HZP5*=s8mhgLI8-@&lKa=hx!i7FXIqCq==Hf>9j(5$b3$VPi$l>s
zUqlKEAwj?~t$rH{`VRB})l*Po;9qdcbm;f)?(SXU&IG|df;~P-qPD&QP8sJRodgdN
zy@;&)&S+bR_U)~kff@Qf)TXwf{a|)Dw=9Oj@u<J$Z_+$sxJ>kGCSjssqKMAX3up}T
e^T-zF6Idyr-6*6>4>x29O*N5NOwn0!KmGw3E&fFS

delta 729
zcmX|9T}TvB7`^w-9e2!~701O;%eH(_hA=my!XVMzEhcPtnei_~wsjkAXx)|BSxt!&
zqB7`3mUa>fw1)}7QkdBL7ExioiRObZQ9kq#)&?P^FKsh{T{xV3?#KN;&f!~Ja8ArS
z7vs1HTz<Lq>b<FA5i>jhpvr=Na~js0+e`>&-qPNT#;)kTUF0=27pBo0Vvd)8z5`=s
z@AM}JWX&_PbB)CefPlBaWWKLH%dD)GG7%xAYN7skW^9eO#i(Kl^T%3QHJ6BLX;ltK
zwW}U2>50jz@-&Z4?q|N5Qw9`SZSaIuWhknSd9KN0h6`fCaWG%YNpifkKP4wLpTD+N
z@Jo?S<D^||hWS!1D340AI-<m6A(7Ie@whj40ZxuXq)%<ZQ{?qKI1X#RumF@XT`))i
zAkre;NdwSBcR|avbx6+=Y-URU_{wgvFQ_?cUXRYga<cdV?y&H-KDP;5@Sj4VK)!84
z_i4gap**G6okOndL4<QPXc=R-)#qP+Wcvtm9wwY0<sJHhfLPj>PH9P_9pR!ON!HTC
zSrNI((J)%C<62{yl1zAdoBC{9t-cPyxQ=k<)`1FAe*<kC;+j3Z-o6IA7!bvf81WuA
z9wW?%@=$U_Net?JGw2u*W)Nx8Pkcn2v5u@<Hqdm9zWNJ2bac!8ushJEKlzPfS%%`z
zUP;F^UotVE45rnnJzJ0@pD2VoB7xv}AsC2s1w=^*1$myA0v(aIOOdutq1|suLAsdA
z?I1s7tRM>bzg=w?Jz^^FT2bD!FloU~%Eo>BPP~X(fm6fIET)$6@x5>QHl{+w&~C-;
wy%CM39w5U-A!8qfa}|^ZGmY4(Pwc1Ml@4pkI6#3Gi_0x8*<<p&l#+`60tfK!t^fc4

diff --git a/win_build/installerv2/redist/Windows/Accounts_CopyFiles.vbs b/win_build/installerv2/redist/Windows/Accounts_CopyFiles.vbs
index 87e3ea9728..18451ceec0 100644
--- a/win_build/installerv2/redist/Windows/Accounts_CopyFiles.vbs
+++ b/win_build/installerv2/redist/Windows/Accounts_CopyFiles.vbs
@@ -25,20 +25,54 @@
 '' copy all the account files from the source path to the destination folder.
 ''
 
-Dim fso
-Dim szInstallDir
-Dim szAccountsLocation
+Function Accounts_CopyFiles()
 
-Set fso = CreateObject("Scripting.FileSystemObject")
-Set szInstallDir = Session.Property("INSTALLDIR")
-Set szAccountsLocation = Session.Property("ACCOUNTS_LOCATION")
+	Dim fso
+	Dim szInstallDir
+	Dim szAccountsLocation
+	Dim iReturnValue
+	
+    On Error Resume Next
 
-If (Not( IsEmpty(szAccountsLocation) )) Or (Not( IsNull(szAccountsLocation) )) Then
+	Set fso = CreateObject("Scripting.FileSystemObject")
+	szInstallDir = Property("INSTALLDIR")
+	szAccountsLocation = Property("ACCOUNTS_LOCATION")
+    
+	If (Not( IsEmpty(szAccountsLocation) )) And (Not( IsNull(szAccountsLocation) )) Then
 
-    '' Append the wildcard search to the end of the account file location
-    '' string
-    szAccountsLocation = szAccountsLocation + "\*.xml"
+ 	   	'' Append the wildcard search to the end of the account file location
+  	   	'' string
+    	szAccountsLocation = szAccountsLocation + "\*.xml"
 
-    fso.CopyFolder szAccountsLocation, szInstallDir  
+    	fso.CopyFile szAccountsLocation, szInstallDir
+    	If ErrHandler("Copy Account Files Failed ") Then
+    	    iReturnValue = IDCANCEL
+    	Else
+    	    iReturnValue = IDOK
+    	End If
 
-End If
+	End If
+
+    '' return success	
+	Accounts_CopyFiles = iReturnValue
+    On Error GoTo 0
+End Function
+
+Function ErrHandler(what)
+    Dim bReturnValue
+
+    If Err.Number > 0 Then
+        MsgBox( what & " Error " & Err.Number & ": " & Err.Description )
+        Err.Clear
+        bReturnValue = True
+    Else
+        bReturnValue = False
+    End If
+
+    ErrHandler = bReturnValue
+End Function
+
+Sub Print(Str)
+    'strip when not debugging
+    'MsgBox(Str)
+End Sub