Mercurial > mxe-octave

changeset 4644:c3950e2b4066

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix vbs scripts to launch with '--gui' option (bug #53369). * octave-firsttime.vbs, octave.vbs: Add 'Chr(34) & "--gui" & Chr(34)' option when calling octave gui executable.
author Rik <rik@octave.org>
date Tue, 27 Mar 2018 09:53:22 -0700
parents b0cb0218813c
children 56a712112482
files installer-files/octave-firsttime.vbs installer-files/octave.vbs
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/installer-files/octave-firsttime.vbs	Mon Mar 26 18:14:40 2018 -0700
+++ b/installer-files/octave-firsttime.vbs	Tue Mar 27 09:53:22 2018 -0700
@@ -40,7 +40,8 @@
 startpath = wshShell.ExpandEnvironmentStrings("%UserProfile%")
 wshShell.CurrentDirectory = startpath
 
-wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe --gui" & Chr(34), 0
+GUIArg = " " & chr(34) & "--gui" & chr(34)
+wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe" & Chr(34) & GUIArg, 0
 
 ' free our objects
 Set fso = Nothing
--- a/installer-files/octave.vbs	Mon Mar 26 18:14:40 2018 -0700
+++ b/installer-files/octave.vbs	Tue Mar 27 09:53:22 2018 -0700
@@ -42,13 +42,14 @@
 AllArgs = ""
 Set wshArgs = WScript.Arguments
 For I = 0 to wshArgs.Count - 1
-  if wshArgs(I) = "--no-gui" then GUI_MODE=0
+  If wshArgs(I) = "--no-gui" Then GUI_MODE=0
   AllArgs = AllArgs & " " & chr(34) & wshArgs(I) & chr(34)
 Next
 
 ' start octave-gui, either with console shown or hidden
 If GUI_MODE = 1 then
-  wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe --gui" & Chr(34) & AllArgs, 0
+  AllArgs = AllArgs & " " & chr(34) & "--gui" & chr(34)
+  wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe" & Chr(34) & AllArgs, 0
 Else
   wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe" & Chr(34) & AllArgs, 1
 End If