source: issm/oecreview/Archive/12678-13393/ISSM-12991-12992.diff

Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh    (revision 12991)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh    (revision 12992)
@@ -1,5 +1,10 @@
 #ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
 
+#FIXME: during installation packages are installed one by one but environment.sh was sourced
+#before so new packages are NOT in the path.
+#may resource environment.sh with:
+#if [ -z $(echo "$PATH" | grep "$MATLAB_DIR") ]; then export $PATH...; fi
+
 #Windows compilers: 
 if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then
        source $ISSM_DIR/externalpackages/windows/windows_environment.sh
@@ -14,30 +19,30 @@
 
 #MATLAB
 MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
-if [ -d "$MATLAB_DIR" ]; then
+#if [ -d "$MATLAB_DIR" ]; then
        export MATLAB_DIR
        export PATH="$MATLAB_DIR/bin:$PATH" #take precedence over /usr/local/bin/matlab
        export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$MATLAB_DIR/lib"
        export LD_RUN_PATH="$LD_RUN_PATH:$MATLAB_DIR/lib"
-fi
+#fi
 
 #MPI
 MPI_DIR="$ISSM_DIR/externalpackages/mpich2/install"
-if [ -d "$MPI_DIR" ]; then
+#if [ -d "$MPI_DIR" ]; then
        export MPI_DIR
        export PATH="$MPI_DIR/bin:$PATH"
        export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$MPI_DIR/lib"
        export LD_RUN_PATH="$LD_RUN_PATH:$MPI_DIR/lib"
        export MANPATH="$MANPATH:$MPI_DIR/man"
-fi
+#fi
 
 #PETSC
 PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
-if [ -d "$PETSC_DIR" ]; then
+#if [ -d "$PETSC_DIR" ]; then
        export PETSC_DIR
        export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PETSC_DIR/lib:$PETSC_DIR/lib"
        export LD_RUN_PATH="$LD_RUN_PATH:$PETSC_DIR/lib"
-fi
+#fi
 
 #SLEPC
 SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
@@ -62,21 +67,21 @@
 
 #AUTOCONF
 AUTOCONF_DIR="$ISSM_DIR/externalpackages/autoconf/install"
-if [ -d "$AUTOCONF_DIR" ]; then
+#if [ -d "$AUTOCONF_DIR" ]; then
        export PATH="$AUTOCONF_DIR/bin:$PATH"
-fi
+#fi
 
 #AUTOMAKE
-AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
-if [ -d "$AUTOMAKE_DIR" ]; then
+#AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
+#if [ -d "$AUTOMAKE_DIR" ]; then
        export PATH="$AUTOMAKE_DIR/bin:$PATH"
-fi
+#fi
 
 #LIBTOOL
 LIBTOOL_DIR="$ISSM_DIR/externalpackages/libtool/install"
-if [ -d "$LIBTOOL_DIR" ]; then
+#if [ -d "$LIBTOOL_DIR" ]; then
        export PATH="$LIBTOOL_DIR/bin:$PATH"
-fi
+#fi
 
 #SDK
 SDK_DIR="C:/MicrosoftVisualStudio 9.0/Microsoft Visual C++ 2008 Express Edition with SP1 - ENU"