Commit 4aa93643 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Minor change to isis3VarInit script/updated documentation to InstallGuide.xml

parent e86a64b2

isis/scripts/isis3VarInit

+7 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ import sys 
parser = argparse.ArgumentParser(description='Usage:  ./isis3VarInit --data_dir <data dir path> --test_dir <test dir path')

   

isisroot = '$CONDA_PREFIX'

data_dir='$CONDA_PREFIX/..data'

testdata_dir='$CONDA_PREFIX/..testData'

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")
@@ -23,10 +23,15 @@ args=parser.parse_args() 
if (data_dir != args.data_dir):

    os.system("mkdir -p "+args.data_dir)

    data_dir = args.data_dir

else:

    print("mkdir -p "+data_dir)

    os.system("mkdir -p "+data_dir)



if (testdata_dir != args.test_dir):

    os.system("mkdir -p "+args.test_dir)

    testdata_dir=args.test_dir

else:

    os.system("mkdir -p "+testdata_dir)



os.popen('mkdir -p '+isisroot+'/etc/conda/activate.d')

os.popen('mkdir -p '+isisroot+'/etc/conda/deactivate.d')

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

+8 −1
Original line number Diff line number Diff line
@@ -56,11 +56,18 @@ you must <em>not</em> upgrade the ISIS Data Files!!! 
          #Download the ISIS3 version with label alpha

          conda install -c usgs-astrogeology isis3

          

          #Execute the ISIS3 variable initialization script.  

          #Execute the ISIS3 variable initialization script with default arguments.

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



         ./$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

         for both of these optional values:



         ./$CONDA_PREFIX/scripts/isis3VarInit --data-dir=[path to data directory]  --test-dir=[path to test data directory]





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



          source activate isis3alpha