Commit 445b7c3a authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Added Janet's edits, updated isis3VarInit

parent ffd16518

isis/scripts/isis3VarInit

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ isisroot = '$CONDA_PREFIX' 
data_dir='$CONDA_PREFIX/data'

testdata_dir='$CONDA_PREFIX/testData'



parser.add_argument("--data_dir",default= data_dir,help="ISIS3 Mission Data Directory")

parser.add_argument("--test_dir",default=testdata_dir,help="ISIS3 Mission Test Data Directory")

parser.add_argument("--data-dir",default= data_dir,help="ISIS3 Mission Data Directory")

parser.add_argument("--test-dir",default=testdata_dir,help="ISIS3 Mission Test Data Directory")



args=parser.parse_args()

if (data_dir != args.data_dir):

isis/src/docsys/documents/InstallGuide/InstallGuide.xml

+5 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ you must <em>not</em> upgrade the ISIS Data Files!!! 
          #Execute the ISIS3 variable initialization script with default arguments.

          #This script prepares default values for:  $ISISROOT/$ISIS3DATA/$ISIS3TESTDATA



         ./$CONDA_PREFIX/scripts/isis3VarInit

         python $CONDA_PREFIX/scripts/isis3VarInit



         Executing this script with no arguments will result in $ISIS3DATA=$CONDA_PREFIX/data, 

         and $ISIS3TESTDATA=$CONDA_PREFIX/testdata.  The user can specify different directories
@@ -70,7 +70,7 @@ you must <em>not</em> upgrade the ISIS Data Files!!! 


          #Run the source activate command a second time to process the changes:



          source activate isis3alpha

          source activate isis3
@@ -133,7 +133,7 @@ you must <em>not</em> upgrade the ISIS Data Files!!! 
  </p>



<A NAME="RunningOnWindowsWithSSH"> </A>

<h3>Setting Up X11 forwarding on Windows with Putty and XMing</h3>

<h3>Setting Up X11 forwarding on Windows with Putty and Xming</h3>

<p>

Some ISIS3 users prefer to run ISIS3 in Windows, but SSH into a computer

that is running ISIS3 and has enabled X11 forwarding.  This requires the