changeset 6372:71ba75cc40bc

maint: Merge release to default.
author John Donoghue <john.donoghue@ieee.org>
date Mon, 22 Aug 2022 14:39:25 -0400
parents 5827d068f184 (current diff) ae320ffbbbe0 (diff)
children 1f09fa71561b
files
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/installer-files/octave-firsttime.vbs	Sun Aug 21 19:58:24 2022 -0400
+++ b/installer-files/octave-firsttime.vbs	Mon Aug 22 14:39:25 2022 -0400
@@ -5,7 +5,12 @@
 ' If running with wscript.exe, "Exec" will flash a window for a split second.
 ' Relaunch with cscript.exe which doesn't show that window.
 If InStr(1, WScript.FullName, "wscript.exe", vbTextCompare) > 0 Then
-  WScript.Quit wshShell.Run("cscript.exe """ & WScript.ScriptFullName & """", 0, True)
+  AllArgs = ""
+  Set wshArgs = WScript.Arguments
+  For I = 0 to wshArgs.Count - 1
+    AllArgs = AllArgs & " " & chr(34) & wshArgs(I) & chr(34)
+  Next
+  WScript.Quit wshShell.Run("cscript.exe """ & WScript.ScriptFullName & """" & AllArgs, 0, True)
 End If
 
 
--- a/installer-files/octave.vbs	Sun Aug 21 19:58:24 2022 -0400
+++ b/installer-files/octave.vbs	Mon Aug 22 14:39:25 2022 -0400
@@ -5,7 +5,12 @@
 ' If running with wscript.exe, "Exec" will flash a window for a split second.
 ' Relaunch with cscript.exe which doesn't show that window.
 If InStr(1, WScript.FullName, "wscript.exe", vbTextCompare) > 0 Then
-  WScript.Quit wshShell.Run("cscript.exe """ & WScript.ScriptFullName & """", 0, True)
+  AllArgs = ""
+  Set wshArgs = WScript.Arguments
+  For I = 0 to wshArgs.Count - 1
+    AllArgs = AllArgs & " " & chr(34) & wshArgs(I) & chr(34)
+  Next
+  WScript.Quit wshShell.Run("cscript.exe """ & WScript.ScriptFullName & """" & AllArgs, 0, True)
 End If
 
 ' get the directory that script resides in