Mercurial > mxe-octave

changeset 4276:b73fe78f73c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If home not set, set it to userprofile * installer-files/octave-firsttime.vbs, installer-files/octave.bat, installer-files/octave.vbs: if HOME env not set, set it to user profile
author John D
date Thu, 15 Dec 2016 12:57:41 -0500
parents d88666c329ba
children 58c59bb894c8
files installer-files/octave-firsttime.vbs installer-files/octave.bat installer-files/octave.vbs
diffstat 3 files changed, 22 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/installer-files/octave-firsttime.vbs	Thu Dec 15 14:11:05 2016 -0500
+++ b/installer-files/octave-firsttime.vbs	Thu Dec 15 12:57:41 2016 -0500
@@ -9,7 +9,6 @@
 Set fo = fso.GetFolder(OctavePath)
 OctavePath = fo.ShortPath
 Set fo = Nothing
-Set fso = Nothing
 
 ' set up path to ensure octave bin comes first
 Set wshSystemEnv = wshShell.Environment( "PROCESS" )
@@ -21,6 +20,13 @@
 
 wshSystemEnv("GS") = "gs.exe"
 
+If wshShell.ExpandEnvironmentStrings("%HOME%") = "%HOME%" Then
+  Home = wshSystemEnv("USERPROFILE")
+  Set fo = fso.GetFolder(Home)
+  wshSystemEnv("HOME") = fo.ShortPath
+  Set fo = Nothing
+End If
+
 ' set Qt plugin directory and path 
 Set objFSO = CreateObject("Scripting.FileSystemObject")
 If objFSO.FolderExists(OctavePath & "\qt5\bin") Then
@@ -37,6 +43,7 @@
 wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe" & Chr(34), 0
 
 ' free our objects
+Set fso = Nothing
 Set wshShell = Nothing
 Set wshSystemEnv = Nothing
 Set wshArgs = Nothing
--- a/installer-files/octave.bat	Thu Dec 15 14:11:05 2016 -0500
+++ b/installer-files/octave.bat	Thu Dec 15 12:57:41 2016 -0500
@@ -19,6 +19,12 @@
 set GNUTERM=windows
 set GS=gs.exe
 
+Rem set home if not already set
+if "%HOME%"=="" set HOME=%USERPROFILE%
+if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH%
+Rem set HOME to 8.3 format
+for %%I in ("%HOME%") do set HOME=%%~sI
+
 Rem   Check for args to see if we are told to start GUI
 Rem   with the --force-gui option or not (--no-gui)
 Rem   Otherwise assume starting as command line
--- a/installer-files/octave.vbs	Thu Dec 15 14:11:05 2016 -0500
+++ b/installer-files/octave.vbs	Thu Dec 15 12:57:41 2016 -0500
@@ -9,7 +9,6 @@
 Set fo = fso.GetFolder(OctavePath)
 OctavePath = fo.ShortPath
 Set fo = Nothing
-Set fso = Nothing
 
 ' set up path to ensure octave bin comes first
 Set wshSystemEnv = wshShell.Environment( "PROCESS" )
@@ -21,6 +20,13 @@
 
 wshSystemEnv("GS") = "gs.exe"
 
+If wshShell.ExpandEnvironmentStrings("%HOME%") = "%HOME%" Then
+  Home = wshSystemEnv("USERPROFILE")
+  Set fo = fso.GetFolder(Home)
+  wshSystemEnv("HOME") = fo.ShortPath
+  Set fo = Nothing
+End If
+
 ' set Qt plugin directory and path 
 Set objFSO = CreateObject("Scripting.FileSystemObject")
 If objFSO.FolderExists(OctavePath & "\qt5\bin") Then
@@ -48,6 +54,7 @@
 End If
 
 ' free our objects
+Set fso = Nothing
 Set wshShell = Nothing
 Set wshSystemEnv = Nothing
 Set wshArgs = Nothing