From f7eacdcfec06365978a11eab8c7e1dbba077d679 Mon Sep 17 00:00:00 2001 From: Daniel Borup Date: Fri, 6 Mar 2020 09:30:51 -0600 Subject: [PATCH] Remove PATH modifiers from launch scripts --- launch/GPI.desktop | 1 + launch/gpi.app | 2 ++ launch/gpi.command | 5 ----- launch/gpi_cmd.bat | 15 --------------- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/launch/GPI.desktop b/launch/GPI.desktop index 42fa0fca..936e53e6 100755 --- a/launch/GPI.desktop +++ b/launch/GPI.desktop @@ -1,3 +1,4 @@ +# No longer in use - deprecate at some point [Desktop Entry] Version=1.0 Name=GPI diff --git a/launch/gpi.app b/launch/gpi.app index f16fd264..f9f37139 100755 --- a/launch/gpi.app +++ b/launch/gpi.app @@ -24,6 +24,8 @@ # MAKES NO WARRANTY AND HAS NO LIABILITY ARISING FROM ANY USE OF THE # SOFTWARE IN ANY HIGH RISK OR STRICT LIABILITY ACTIVITIES. +# No longer in use - deprecate at some point + # The GPI launcher script for the app. ANACONDA=/opt/anaconda1anaconda2anaconda3 # The launcher must point to a script with the ".command" suffix so that 'open' diff --git a/launch/gpi.command b/launch/gpi.command index 05b34bbc..826f9c69 100755 --- a/launch/gpi.command +++ b/launch/gpi.command @@ -36,11 +36,6 @@ ANACONDA=/opt/anaconda1anaconda2anaconda3 PYTHON=${ANACONDA}/bin/python GPI_LAUNCH=${ANACONDA}/bin/gpi_launch -BINDIR="$ANACONDA/bin" -if ! echo $PATH | grep -q $BINDIR ; then - PATH="${BINDIR}:${PATH}" -fi - GPI_LINK=/tmp/GPI # OSX diff --git a/launch/gpi_cmd.bat b/launch/gpi_cmd.bat index cd6be287..380183c3 100644 --- a/launch/gpi_cmd.bat +++ b/launch/gpi_cmd.bat @@ -30,20 +30,5 @@ set ANACONDA=/opt/anaconda1anaconda2anaconda3 set PYTHON=%ANACONDA%\python set GPI_LAUNCH=%ANACONDA%\Scripts\gpi_launch -:: Add needed folders to the path if launching from outside an active conda -set ANACONDA_WIN=%ANACONDA:/=\% -echo %PATH% | findstr %ANACONDA_WIN% > NUL -if %ERRORLEVEL% NEQ 0 goto :fixpath -goto :endif - -:fixpath - set PATH=%ANACONDA_WIN%\bin;%PATH% - set PATH=%ANACONDA_WIN%\Scripts;%PATH% - set PATH=%ANACONDA_WIN%\Library\bin;%PATH% - set PATH=%ANACONDA_WIN%\Library\usr\bin;%PATH% - set PATH=%ANACONDA_WIN%\Library\mingw-w64\bin;%PATH% - set PATH=%ANACONDA_WIN%;%PATH% -:endif - %PYTHON% %GPI_LAUNCH% -style Windows %*