changeset 3859:74f53761f74d

GUI: run octave-gui for both gui and non gui options * installer-files/octave.vbs: always run octave-gui
author John Donoghue <john.donoghue@ieee.org>
date Mon, 23 Mar 2015 19:48:56 -0400
parents 9ceedf18871e
children b36a7ab4bd2c
files installer-files/octave.vbs
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/installer-files/octave.vbs	Mon Mar 23 19:34:25 2015 -0400
+++ b/installer-files/octave.vbs	Mon Mar 23 19:48:56 2015 -0400
@@ -20,16 +20,15 @@
 AllArgs = ""
 Set wshArgs = WScript.Arguments
 For I = 0 to wshArgs.Count - 1
-  if wshArgs(I) = "--force-gui" then GUI_MODE=1
   if wshArgs(I) = "--no-gui" then GUI_MODE=0
   AllArgs = AllArgs & " " & chr(34) & wshArgs(I) & chr(34)
 Next
 
-' start whatever octave we no want to run
+' start octave-gui, either with console shown or hidden
 If GUI_MODE = 1 then
   wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe" & Chr(34) & AllArgs, 0
 Else
-  wshShell.Run chr(34) & OctavePath & "\bin\octave-cli.exe" & Chr(34) & AllArgs, 1
+  wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe" & Chr(34) & AllArgs, 1
 End If
 
 ' free our objects