From 0aaf2a2c91fd46e63e873c952317da0e24c0dc5e Mon Sep 17 00:00:00 2001 From: Kristin Date: Fri, 31 Jul 2020 13:28:26 -0700 Subject: [PATCH 1/5] Update README.md --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index af22d34ca8..5331c07e8d 100644 --- a/README.md +++ b/README.md @@ -89,16 +89,26 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ 7. Finally, setup the environment variables: +For versions of ISIS 4.2.0 and earlier, use: + #Execute the ISIS variable initialization script with default arguments. #This script prepares default values for: $ISISROOT, $ISISDATA, $ISISTESTDATA - python $CONDA_PREFIX/scripts/isisVarInit.py + python $CONDA_PREFIX/scripts/isis3VarInit.py + +For version of ISIS after 4.2.0, use: + python $CONDA_PREFIX/scripts/isisVarInit.py Executing this script with no arguments will result in $ISISDATA=$CONDA\_PREFIX/data, and $ISISTESTDATA=$CONDA\_PREFIX/testdata. The user can specify different directories for both of these optional values: +For ISIS 4.2.0 and earlier, use: + python $CONDA_PREFIX/scripts/isisVarInit.py --data-dir=[path to data directory] --test-dir=[path to test data directory] +For versions of ISIS after 4.2.0, use: + + python $CONDA_PREFIX/scripts/isisVarInit.py --data-dir=[path to data directory] --test-dir=[path to test data directory] More information about the ISISDATA environment variable and the ISIS Data Area can be found [here]("#The-ISIS-Data-Area"). Now everytime the isis environment is activated, $ISISROOT, $ISISDATA, and $ISISTESTDATA will be set to the values passed to isisVarInit.py. This does not happen retroactively, so re-activate the isis envionment with one of the following commands: From d6fab617d7c7a763deb09cb93008aa4576c1bc9c Mon Sep 17 00:00:00 2001 From: Kristin Date: Fri, 31 Jul 2020 13:34:12 -0700 Subject: [PATCH 2/5] fixed formatting --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5331c07e8d..3b3feace7e 100644 --- a/README.md +++ b/README.md @@ -89,24 +89,24 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ 7. Finally, setup the environment variables: -For versions of ISIS 4.2.0 and earlier, use: + For versions of ISIS 4.2.0 and earlier, use: #Execute the ISIS variable initialization script with default arguments. #This script prepares default values for: $ISISROOT, $ISISDATA, $ISISTESTDATA python $CONDA_PREFIX/scripts/isis3VarInit.py -For version of ISIS after 4.2.0, use: + For version of ISIS after 4.2.0, use: python $CONDA_PREFIX/scripts/isisVarInit.py Executing this script with no arguments will result in $ISISDATA=$CONDA\_PREFIX/data, and $ISISTESTDATA=$CONDA\_PREFIX/testdata. The user can specify different directories for both of these optional values: -For ISIS 4.2.0 and earlier, use: + For ISIS 4.2.0 and earlier, use: python $CONDA_PREFIX/scripts/isisVarInit.py --data-dir=[path to data directory] --test-dir=[path to test data directory] -For versions of ISIS after 4.2.0, use: + For versions of ISIS after 4.2.0, use: python $CONDA_PREFIX/scripts/isisVarInit.py --data-dir=[path to data directory] --test-dir=[path to test data directory] From 119c11222b16e4338e15e789b81b51772eb5f680 Mon Sep 17 00:00:00 2001 From: Kristin Date: Fri, 31 Jul 2020 13:35:35 -0700 Subject: [PATCH 3/5] typo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3b3feace7e..2967315ac9 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ python $CONDA_PREFIX/scripts/isis3VarInit.py - For version of ISIS after 4.2.0, use: + For versions of ISIS after 4.2.0, use: python $CONDA_PREFIX/scripts/isisVarInit.py @@ -104,7 +104,7 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ For ISIS 4.2.0 and earlier, use: - python $CONDA_PREFIX/scripts/isisVarInit.py --data-dir=[path to data directory] --test-dir=[path to test data directory] + python $CONDA_PREFIX/scripts/isis3VarInit.py --data-dir=[path to data directory] --test-dir=[path to test data directory] For versions of ISIS after 4.2.0, use: From d7660598423cd0caa0679f3286f768a86b5475cc Mon Sep 17 00:00:00 2001 From: Kristin Date: Fri, 31 Jul 2020 13:37:50 -0700 Subject: [PATCH 4/5] formatting again --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2967315ac9..dcc65833bb 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ For versions of ISIS after 4.2.0, use: - python $CONDA_PREFIX/scripts/isisVarInit.py + python $CONDA_PREFIX/scripts/isisVarInit.py Executing this script with no arguments will result in $ISISDATA=$CONDA\_PREFIX/data, and $ISISTESTDATA=$CONDA\_PREFIX/testdata. The user can specify different directories for both of these optional values: From 5f4f694bf5c2cdd4b63d8ec587bc85e4450188a3 Mon Sep 17 00:00:00 2001 From: Kristin Date: Fri, 31 Jul 2020 13:51:12 -0700 Subject: [PATCH 5/5] Update based on feedback --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dcc65833bb..46a76231d5 100644 --- a/README.md +++ b/README.md @@ -89,10 +89,9 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ 7. Finally, setup the environment variables: - For versions of ISIS 4.2.0 and earlier, use: + To use the default values for: `$ISISROOT, $ISISDATA, $ISISTESTDATA`, run the ISIS variable initialization script with default arguments. - #Execute the ISIS variable initialization script with default arguments. - #This script prepares default values for: $ISISROOT, $ISISDATA, $ISISTESTDATA + To do this, for versions of ISIS 4.2.0 and earlier, use: python $CONDA_PREFIX/scripts/isis3VarInit.py