Unverified Commit 6f548d54 authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #570 from jessemapel/startup 

Fixed isis3Startup scripts
parents c6fa3677 740d5de1

isis/scripts/isis3Startup.csh

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#                       to "/usgs/cpkgs/isis3/testData"

#       SEP 08 2017 - Christopher Combs - Removed setting of QT_PLUGIN_PATH as

#                       an environment variable. Fixes #4617

#       NOV 15 2018 - Jesse Mapel - Changed default ISISROOT to new install

#                       directory.

#_VER   $Id: isis3Startup.csh,v 1.5 2010/03/16 19:40:22 ehyer Exp $

#_END

################################################################################
@@ -34,7 +36,7 @@ set Platform = `uname -s` 
# Initialize the ISISROOT environment variable if it doesn't exist

# TODO: Test is obsolete, fail if no isisroot is set

if ($?ISISROOT == 0) then

  setenv ISISROOT /usgs/pkgs/isis3/isis

  setenv ISISROOT /usgs/pkgs/isis3/install

endif



# Initialize the ISIS3DATA environment variable

isis/scripts/isis3Startup.py

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ def setisis(): 


  #... and if it's not give it a default value

  if ISISROOT is None:

    ISISROOT = "/usgs/pkgs/isis3/isis"

    ISISROOT = "/usgs/pkgs/isis3/install"

    os.environ['ISISROOT'] = ISISROOT



  #Check for the ISIS3DATA directory. If it does not exist use a default

isis/scripts/isis3Startup.sh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# the Isis distribution

#

if [ ! "$ISISROOT" ]; then

  ISISROOT=/usgs/pkgs/isis3/isis

  ISISROOT=/usgs/pkgs/isis3/install

  export ISISROOT

fi