FS-4768 part of garmts changes

diff --git a/libs/win32/util.vbs b/libs/win32/util.vbs
index 887415f4373f80c58cd936b4579cc5b8849868d1..58ca2e4e2b7217836ee01e9ca6b0f3f5e8292770 100644 (file)
--- a/libs/win32/util.vbs
+++ b/libs/win32/util.vbs
@@ -126,9 +126,16 @@ Sub GetWgetEXE(DestFolder)
        End If  \r
 End Sub\r
 \r
+Function Strip(Str)
+       Set oRE = New Regexp 
+       oRE.Pattern = "[\W_]" 
+       oRE.Global = True 
+       Strip=oRE.Replace(Str, "") 
+End Function
+
 Sub UnCompress(Archive, DestFolder)\r
-       batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat"\r
-       wscript.echo("Extracting: " & Archive)\r
+       batname = "tmp" & Strip(Archive) & CStr(Int(10000*Rnd)) & ".bat"
+       wscript.echo("Extracting: " & Archive & " - using: " & batname)
        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