# HG changeset patch # User John Donoghue # Date 1581367222 18000 # Node ID 3c10ce089d7cf25a77e81e1b0c0ba7b97a453e07 # Parent 561da151205efe554655c0ed5b5ef23663826e38 Add pthon path to launch script files * installer-files/cmdshell.bat, installer-files/octave-firsttime.vbs, installer-files/octave.bat, installer-files/octave.vbs: add python dir path diff -r 561da151205e -r 3c10ce089d7c installer-files/cmdshell.bat --- a/installer-files/cmdshell.bat Mon Feb 10 15:40:21 2020 -0500 +++ b/installer-files/cmdshell.bat Mon Feb 10 15:40:22 2020 -0500 @@ -26,7 +26,7 @@ Rem Set up PATH. Make sure the octave bin dir Rem comes first. -set PATH=%OCTAVE_HOME%qt5\bin;%OCTAVE_HOME%bin;%PATH% +set PATH=%OCTAVE_HOME%qt5\bin;%OCTAVE_HOME%bin;%OCTAVE_HOME%python;%PATH% set TERM=cygwin set GS=gs.exe set GNUTERM=wxt diff -r 561da151205e -r 3c10ce089d7c installer-files/octave-firsttime.vbs --- a/installer-files/octave-firsttime.vbs Mon Feb 10 15:40:21 2020 -0500 +++ b/installer-files/octave-firsttime.vbs Mon Feb 10 15:40:22 2020 -0500 @@ -28,6 +28,7 @@ ' set up path to ensure octave bin comes first Set wshSystemEnv = wshShell.Environment( "PROCESS" ) +wshSystemEnv("PATH") = OctavePath & "\python;" & wshSystemEnv("PATH") if OctavePath <> MSysPath Then wshSystemEnv("PATH") = MSysPath & "\bin;" & wshSystemEnv("PATH") End If diff -r 561da151205e -r 3c10ce089d7c installer-files/octave.bat --- a/installer-files/octave.bat Mon Feb 10 15:40:21 2020 -0500 +++ b/installer-files/octave.bat Mon Feb 10 15:40:22 2020 -0500 @@ -26,7 +26,7 @@ Rem Set up PATH. Make sure the octave bin dir comes first. -set PATH=%OCT_HOME%qt5\bin;%OCT_HOME%bin;%MSYSPATH%bin;%PATH% +set PATH=%OCT_HOME%qt5\bin;%OCT_HOME%bin;%MSYSPATH%bin;%OCT_HOME%python;%PATH% Rem Set up any environment vars we may need. diff -r 561da151205e -r 3c10ce089d7c installer-files/octave.vbs --- a/installer-files/octave.vbs Mon Feb 10 15:40:21 2020 -0500 +++ b/installer-files/octave.vbs Mon Feb 10 15:40:22 2020 -0500 @@ -28,6 +28,7 @@ ' set up path to ensure octave bin comes first Set wshSystemEnv = wshShell.Environment( "PROCESS" ) +wshSystemEnv("PATH") = OctavePath & "\python;" & wshSystemEnv("PATH") if OctavePath <> MSysPath Then wshSystemEnv("PATH") = MSysPath & "\bin;" & wshSystemEnv("PATH") End If