Changeset 11916

Timestamp:

04/04/12 15:14:46 (13 years ago)

Author:

schlegel

Message:

allow passing of arguments to overwrite environment variables

File:

• issm/trunk-jpl/etc/environment.sh (modified) (2 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -1 +1 @@
 #ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
+
+#Windows compilers: 
+if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then
+        source $ISSM_TIER/externalpackages/windows/windows_environment.sh
+fi
+
 source $ISSM_TIER/etc/environment_variables.sh
 
-#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables 
+#Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them after exporting the variables
 #to environment.
 for i in $@
@@ -8 +14 @@
         eval $i
 done
-
-#Windows compilers: 
-if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then
-        source $ISSM_TIER/externalpackages/windows/windows_environment.sh
-fi
-
-source $ISSM_TIER/etc/environment_variables.sh
 
 #CRON utilities