FS-4768 applied hopefully final patch(for now) to util.vbs

diff --git a/.gitignore b/.gitignore
index 330e6100432c2c880dab898604b042d0a54306b7..fafe175062ecbd870bbef54eb3ace364f7cf944a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,6 @@ ipch/
 /w32/Setup/obj
 *dSYM*
 /libs/xmlrpc-c/lib/expat/xmltok/nametab.h
+
+/UpgradeLog.*
+/_UpgradeReport_Files/

diff --git a/libs/.gitignore b/libs/.gitignore
index 27b3d3e76dd30e09ca6d64e0c6c307e1749bf633..d01a5736f33de870adf77ae4ceca7e9d97b9c2d5 100644 (file)
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -357,6 +357,7 @@ opal
 /libwebsockets/test-server/Makefile.in
 /mongo-cxx-driver-v*/
 /mpg123/
+/libmpg123/
 /openldap-*/
 /openssl-*/
 /openzap/build/compile

diff --git a/libs/win32/util.vbs b/libs/win32/util.vbs
index a696adbf2daca56a9e1d58ee67835a1a6fc0ae04..15d69a89243427f00646530c17fda89118f1e76d 100644 (file)
--- a/libs/win32/util.vbs
+++ b/libs/win32/util.vbs
@@ -94,6 +94,8 @@ End Sub
 Sub GetCompressionTools(DestFolder)\r
        Dim tries\r
        Dim max_tries\r
+       Dim MyFile\r
+\r
        tries = 0\r
        max_tries = 10\r
        If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If\r
@@ -109,6 +111,7 @@ Sub GetCompressionTools(DestFolder)
                        FSO.DeleteFile DestFolder & "7za.tag", true\r
                        Wscript.echo("Downloaded 7za.exe")\r
                End If\r
+               Set MyFile = Nothing\r
                WScript.Sleep(500)\r
        End If\r
        Do While FSO.FileExists(DestFolder & "7za.tag") And tries < max_tries\r
@@ -137,33 +140,44 @@ Function Strip(Str)
        Strip = Right(oRE.Replace(Str, ""), 20)\r
 End Function\r
 \r
+Sub ExecPrintOutput(Str)\r
+       Dim Process\r
+\r
+       Set Process = WshShell.Exec(Str)\r
+\r
+       Do\r
+               If Not Process.StdOut.atEndOfStream Then\r
+                       WScript.Echo Process.StdOut.ReadLine()\r
+               End If\r
+       Loop Until (Process.Status <> 0) And (Process.StdOut.atEndOfStream)\r
+\r
+       Process.Terminate \r
+       WScript.Sleep(500)\r
+End Sub\r
+\r
 Sub UnCompress(Archive, DestFolder)\r
        Dim Fn\r
        Dim batname\r
-       \r
+       Dim MyFile\r
+\r
        GetCompressionTools UtilsDir\r
-       \r
+\r
        batname = "tmp" & Strip(Archive) & CStr(Int(10000*Rnd)) & ".bat"\r
        wscript.echo("Extracting: " & Archive & " - using: " & batname)\r
-       Set MyFile = fso.CreateTextFile(UtilsDir & batname, True)\r
+       Set MyFile = FSO.CreateTextFile(UtilsDir & batname, True)\r
        MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Archive & quote & " -y -o" & quote & DestFolder & quote )\r
        MyFile.Close\r
-       Set oExec = WshShell.Exec(UtilsDir & batname)\r
-       Do\r
-               WScript.Echo OExec.StdOut.ReadLine()\r
-       Loop While Not OExec.StdOut.atEndOfStream\r
+       Set MyFile = Nothing\r
+       ExecPrintOutput(UtilsDir & batname)\r
        wscript.echo("Ready extracting: " & Archive)\r
        Fn = Left(Archive, Len(Archive)-3)\r
        If FSO.FileExists(Fn) Then\r
                Set MyFile = FSO.CreateTextFile(UtilsDir & batname, True)\r
                MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Fn & quote & " -y -o" & quote & DestFolder & quote )\r
                MyFile.Close\r
-               Set oExec = WshShell.Exec(UtilsDir & batname)\r
-               Do\r
-                       WScript.Echo OExec.StdOut.ReadLine()\r
-               Loop While Not OExec.StdOut.atEndOfStream\r
+               Set MyFile = Nothing\r
+               ExecPrintOutput(UtilsDir & batname)\r
                wscript.echo("Ready extracting: " & Fn)\r
-               WScript.Sleep(500)\r
                wscript.echo("Deleting: " & Fn)\r
                FSO.DeleteFile Fn,true\r
        End If\r
@@ -172,12 +186,9 @@ Sub UnCompress(Archive, DestFolder)
                Set MyFile = FSO.CreateTextFile(UtilsDir & batname, True)\r
                MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Fn & quote & " -y -o" & quote & DestFolder & quote )\r
                MyFile.Close\r
-               Set oExec = WshShell.Exec(UtilsDir & batname)\r
-               Do\r
-                       WScript.Echo OExec.StdOut.ReadLine()\r
-               Loop While Not OExec.StdOut.atEndOfStream\r
+               Set MyFile = Nothing\r
+               ExecPrintOutput(UtilsDir & batname)\r
                wscript.echo("Ready extracting: " & Fn )\r
-               WScript.Sleep(500)\r
                wscript.echo("Deleting: " & Fn)\r
                FSO.DeleteFile Fn,true\r
        End If\r
@@ -189,6 +200,8 @@ Sub UnCompress(Archive, DestFolder)
 End Sub\r
 \r
 Sub Wget(URL, DestFolder)\r
+       Dim MyFile\r
+\r
        StartPos = InstrRev(URL, "/", -1, 1)\r
        strlength = Len(URL)\r
        filename=Right(URL,strlength-StartPos)\r
@@ -197,15 +210,12 @@ Sub Wget(URL, DestFolder)
        If UseWgetEXE Then\r
                Wscript.echo("wget: " & URL)\r
                batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat"\r
-               Set MyFile = fso.CreateTextFile(UtilsDir & batname, True)\r
+               Set MyFile = FSO.CreateTextFile(UtilsDir & batname, True)\r
                MyFile.WriteLine("@cd " & quote & DestFolder & quote)\r
                MyFile.WriteLine("@" & quote & UtilsDir & "wget.exe" & quote & " " & URL)\r
                MyFile.Close\r
-               Set oExec = WshShell.Exec(UtilsDir & batname)\r
-               Do\r
-                       WScript.Echo OExec.StdOut.ReadLine()\r
-               Loop While Not OExec.StdOut.atEndOfStream\r
-\r
+               Set MyFile = Nothing\r
+               ExecPrintOutput(UtilsDir & batname)\r
        Else\r
                Wscript.echo("XMLHTTP GET: " & URL)\r
 \r
@@ -226,6 +236,8 @@ Sub Wget(URL, DestFolder)
 End Sub\r
 \r
 Sub Slow_Wget(URL, DestFolder)\r
+       Dim MyFile\r
+\r
        StartPos = InstrRev(URL, "/", -1, 1)\r
        strlength = Len(URL)\r
        filename=Right(URL,strlength-StartPos)\r
@@ -236,11 +248,12 @@ Sub Slow_Wget(URL, DestFolder)
        xml.Send\r
 \r
        const ForReading = 1 , ForWriting = 2 , ForAppending = 8\r
-       Set MyFile = fso.OpenTextFile(DestFolder & filename ,ForWriting, True)\r
+       Set MyFile = FSO.OpenTextFile(DestFolder & filename ,ForWriting, True)\r
        For i = 1 to lenb(xml.responseBody)\r
        MyFile.write Chr(Ascb(midb(xml.responseBody,i,1)))\r
        Next\r
        MyFile.Close()\r
+       Set MyFile = Nothing\r
 \r
 End Sub\r
 \r
@@ -292,29 +305,37 @@ Sub FindReplaceInFile(FileName, sFind, sReplace)
 End Sub\r
 \r
 Function ExecAndGetResult(tmpFolder, VersionDir, execStr)\r
+       Dim MyFile\r
+\r
        Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpExec.Bat", True)\r
        MyFile.WriteLine("@" & "cd " & quote & VersionDir & quote)\r
        MyFile.WriteLine("@" & execStr)\r
        MyFile.Close\r
+       Set MyFile = Nothing\r
 \r
        Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpExec.Bat" & quote)\r
 \r
        ExecAndGetResult = Trim(OExec.StdOut.ReadLine())\r
 \r
        Do\r
-       Loop While Not OExec.StdOut.atEndOfStream\r
+       Loop Until (oExec.Status <> 0) And (oExec.StdOut.atEndOfStream)\r
+\r
+       oExec.Terminate \r
+       WScript.Sleep(500)\r
 \r
        FSO.DeleteFile(tmpFolder & "tmpExec.Bat")\r
 \r
 End Function\r
 \r
 Function ExecAndGetExitCode(tmpFolder, VersionDir, execStr)\r
+       Dim MyFile\r
 \r
        Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpExec.Bat", True)\r
        MyFile.WriteLine("@" & "cd " & quote & VersionDir & quote)\r
        MyFile.WriteLine("@" & execStr)\r
        MyFile.WriteLine("@exit %ERRORLEVEL%")\r
        MyFile.Close\r
+       Set MyFile = Nothing\r
 \r
        ExecAndGetExitCode = WshShell.Run("cmd /C " & quote & tmpFolder & "tmpExec.Bat" & quote, 0, True)\r
 \r
@@ -403,12 +424,16 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
                        sLastVersion = sLastFile.ReadLine()\r
                End If\r
                sLastFile.Close\r
+               Set sLastFile = Nothing\r
        End If\r
 \r
        If VERSION & " " & strVerHuman <> sLastVersion Then\r
-               Set MyFile = fso.CreateTextFile(tmpFolder & "lastversion", True)\r
+               Dim MyFile\r
+\r
+               Set MyFile = FSO.CreateTextFile(tmpFolder & "lastversion", True)\r
                MyFile.WriteLine(VERSION & " " & strVerHuman)\r
                MyFile.Close\r
+               Set MyFile = Nothing\r
 \r
                FSO.CopyFile includebase, includedest, true\r
                FindReplaceInFile includedest, "@SWITCH_VERSION_REVISION@", VERSION\r