Changeset 25913


Ignore:
Timestamp:
12/21/20 20:50:31 (4 years ago)
Author:
jdquinn
Message:

CHG: Merging (ba)sh environment -> csh

Location:
issm/trunk-jpl/etc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/etc/environment.csh

    r25852 r25913  
    1 #ISSM_DIR should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
    2 
    3 #Load ISSM scripts
    4 setenv PATH {$PATH}:{$ISSM_DIR}/scripts
     1# Modifies path-related envrionment variables based on which external packages
     2# have been installed.
     3#
     4# ISSM_DIR and ISSM_ARCH should have been defined already in your shell
     5# settings file (i.e. .bashrc, .cshrc).
     6#
     7# TODO:
     8# - Condition all path modifications on existence of external package 'install'
     9#       directory
     10#
     11
     12# Silence `<command>: no match`
     13set nonomatch=1
     14
     15setenv PATH "{$PATH}:{$ISSM_DIR}/aux-config"
     16setenv PATH "{$PATH}:{$ISSM_DIR}/scripts"
    517
    618set ISSM_EXT_DIR="{$ISSM_DIR}/externalpackages" # Redefine this constant if externalpackages are installed to a different directory
    719
    8 #MPI
    9 set MPI_DIR="{$ISSM_EXT_DIR}/mpich/install"
    10 if (-d $MPI_DIR) then
    11         setenv MPI_DIR {$MPI_DIR}
    12         setenv PATH {$MPI_DIR}/bin:{$PATH}
    13         setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$MPI_DIR/lib
    14         setenv MANPATH {$MANPATH}:$MPI_DIR/man
    15 endif
    16 
    17 #PETSC
    18 set PETSC_DIR="{$ISSM_EXT_DIR}/petsc/install"
    19 if (-d $PETSC_DIR) then
    20         setenv PETSC_DIR {$PETSC_DIR}
    21         setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$PETSC_DIR/lib
    22 endif
    23 
    24 set SCOTCH_DIR="{$ISSM_EXT_DIR}/scotch/install"
    25 if (-d $SCOTCH_DIR) then
    26         setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SCOTCH_DIR/lib
    27 endif
    28 
    29 #SLEPC
    30 set SLEPC_DIR="{$ISSM_EXT_DIR}/slepc/install"
    31 if (-d $SLEPC_DIR) then
    32         setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SLEPC_DIR/lib
    33 endif
    34 
    35 #PETSC
    36 set TAO_DIR="{$ISSM_EXT_DIR}/tao/install"
    37 if (-d $TAO_DIR) then
    38         setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$TAO_DIR/lib
    39 endif
    40 
    41 #Dakota
    42 set DAKOTA_DIR="{$ISSM_EXT_DIR}/dakota/install"
    43 if (-d $DAKOTA_DIR) then
    44         setenv PATH {$DAKOTA_DIR}/bin:{$PATH}
    45         setenv MANPATH {$MANPATH}:{$MPI_DIR}/man:{$DAKOTA_DIR}/docs/man:{$DAKOTA_DIR}/docs/man-ref
    46         setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$DAKOTA_DIR/lib
    47 endif
    48 
    49 #Boost
    50 set BOOST_DIR="{$ISSM_EXT_DIR}/boost/install"
    51 set BOOSTROOT="{$ISSM_EXT_DIR}/boost/install"
    52 if (-d $BOOST_DIR) then
    53    setenv PATH {$BOOST_DIR}/bin:{$PATH}
    54         setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$BOOST_DIR/lib
    55 endif
    56 
    57 #Doxygen
    58 set DOXYGEN_DIR="{$ISSM_EXT_DIR}/doxygen/install"
    59 if (-d $DOXYGEN_DIR) then
    60         setenv MANPATH {$MANPATH}:{$DOXYGEN_DIR}/man
    61         setenv PATH {$PATH}:{$DOXYGEN_DIR}/bin
    62 endif
    63 
    64 #AUTOTOOLS
    65 set AUTOTOOLS_DIR="{$ISSM_EXT_DIR}/autotools/install"
    66 if (-d $AUTOTOOLS_DIR) then
    67         setenv PATH {$AUTOTOOLS_DIR}/bin:{$PATH}
    68 endif
    69 
    70 #SSH
    71 set SSH_DIR="{$ISSM_EXT_DIR}/ssh"
    72 if (-d $SSH_DIR) then
    73         setenv PATH {$PATH}:{$SSH_DIR}
    74 endif
    75 
    76 #VALGRIND
    77 set VALGRIND_DIR="{$ISSM_EXT_DIR}/valgrind/install/bin"
    78 if (-d $VALGRIND_DIR) then
    79         setenv PATH {$PATH}:{$VALGRIND_DIR}
    80 endif
    81 
    82 #MERCURIAL
    83 set MERCURIAL_DIR="{$ISSM_EXT_DIR}/mercurial/install"
    84 if (-d $MERCURIAL_DIR) then
    85         setenv PYTHONPATH {$MERCURIAL_DIR}/mercurial/pure/
    86         setenv PATH {$PATH}:{$MERCURIAL_DIR}
    87 endif
    88 
    89 #GSL
    90 set GSL_DIR="{$ISSM_EXT_DIR}/gsl/install"
    91 if (-d $GSL_DIR) then
    92         setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$GSL_DIR}/lib
    93 endif
    94 
    95 #CMAKE
    96 set CMAKE_DIR="{$ISSM_EXT_DIR}/cmake/install"
    97 if (-d $CMAKE_DIR) then
    98         setenv PATH {$CMAKE_DIR}/bin:{$PATH}
    99 endif
    100 
    101 #YAMS
    102 set YAMS_DIR="{$ISSM_EXT_DIR}/yams/install"
    103 if (-d $YAMS_DIR) then
    104         setenv PATH {$PATH}:{$YAMS_DIR}/bin
    105 endif
    106 
    107 #SHELL2JUNIT
    108 set SHELL2JUNIT_DIR="{$ISSM_EXT_DIR}/shell2junit"
    109 if (-d $SHELL2JUNIT_DIR) then
    110         setenv PATH {$SHELL2JUNIT_DIR}/install:{$PATH}
    111 endif
    112 
    113 #GMT
    114 set GMT_DIR="{$ISSM_EXT_DIR}/gmt"
    115 if (-d $GMT_DIR) then
    116         setenv PATH {$GMT_DIR}/install/bin/:{$PATH}
    117 endif
     20#########################
     21# Command-line utilities
     22#########################
     23set SSH_ROOT="{$ISSM_EXT_DIR}/ssh"
     24if ( -d {$SSH_ROOT} ) then
     25        setenv PATH "{$PATH}:{$SSH_ROOT}"
     26endif
     27
     28#############################
     29# Build systems
     30#############################
     31set AUTOTOOLS_ROOT="{$ISSM_EXT_DIR}/autotools/install"
     32setenv PATH "{$AUTOTOOLS_ROOT}/bin:{$PATH}"
     33
     34set CMAKE_ROOT="{$ISSM_EXT_DIR}/cmake/install"
     35setenv PATH "{$CMAKE_ROOT}/bin:{$PATH}"
     36
     37#############################
     38# Libraries / binaries
     39#############################
     40set MPI_ROOT="{$ISSM_EXT_DIR}/mpich/install"
     41if ( -d {$MPI_ROOT} ) then
     42        setenv MPI_DIR {$MPI_ROOT}
     43        setenv MPI_HOME {$MPI_ROOT} # Used in installation of Dakota
     44        setenv MPI_INC_DIR {$MPI_ROOT}/include
     45        setenv PATH "{$MPI_ROOT}/bin:{$PATH}"
     46        setenv CPATH "{$MPI_ROOT}/include:{$CPATH}"
     47        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$MPI_ROOT}/lib"
     48endif
     49
     50# NOTE: Check *must* come before PETSc as we prefer packages installed via
     51#               PETSc
     52#
     53set ZLIB_ROOT="{$ISSM_EXT_DIR}/zlib/install"
     54if ( -d {$ZLIB_ROOT} ) then
     55        setenv ZLIB_ROOT {$ZLIB_ROOT} # Used in installation of NetCDF, GDAL, GMT
     56        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$LD_LIBRARY_PATH}/lib"
     57endif
     58
     59set PETSC_ROOT="{$ISSM_EXT_DIR}/petsc/install"
     60if ( -d {$PETSC_ROOT} ) then
     61        setenv PETSC_ROOT {$PETSC_ROOT}
     62        setenv LD_LIBRARY_PATH "{$PETSC_ROOT}/lib:{$LD_LIBRARY_PATH}"
     63
     64        # In case we have installed certain external packages via PETSc
     65        #
     66
     67        # BLAS
     68        if ( `find {$PETSC_ROOT}/lib -name libblas.*` != "" || `find {$PETSC_ROOT}/lib -name libfblas.*` != "" ) then
     69                setenv BLAS_ROOT "{$PETSC_ROOT}" # Used in installation of Dakota, GMT
     70        endif
     71
     72        # HDF5
     73        if ( `find {$PETSC_ROOT}/lib -name libhdf5.*` != "" ) then
     74                setenv HDF5_ROOT "{$PETSC_ROOT}" # Used in installation of NetCDF, GDAL
     75                setenv CPATH "{$CPATH}:{$PETSC_ROOT}/include"
     76                setenv LIBRARY_PATH "{$LIBRARY_PATH}:{$PETSC_ROOT}/lib"
     77                setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$PETSC_ROOT}/lib"
     78                setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$PETSC_ROOT}/lib"
     79        endif
     80
     81        # LAPACK
     82        if ( `find {$PETSC_ROOT}/lib -name liblapack.*` != "" || `find {$PETSC_ROOT}/lib -name libflapack.*` != "" ) then
     83                setenv LAPACK_ROOT "{$PETSC_ROOT}" # Used in installation of Dakota, GMT
     84        endif
     85
     86        # METIS
     87        if ( `find {$PETSC_ROOT}/lib -name libmetis.*` != "" ) then
     88                setenv METIS_ROOT "{$PETSC_ROOT}" # Used in installation of Gmsh
     89        endif
     90
     91        # MPICH
     92        if ( -f "{$PETSC_ROOT}/bin/mpiexec" ) then
     93                set MPI_ROOT={$PETSC_ROOT}
     94                setenv MPI_DIR {$MPI_ROOT}
     95                setenv MPI_HOME {$MPI_ROOT} # Used in installation of Dakota
     96                setenv MPI_INC_DIR "{$MPI_ROOT}/include"
     97                setenv PATH "{$MPI_ROOT}/bin:{$PATH}"
     98                setenv CPATH "{$MPI_ROOT}/include:{$CPATH}"
     99                setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$MPI_ROOT}/lib"
     100        endif
     101
     102        # ZLIB
     103        if ( `find {$PETSC_ROOT}/lib -name libz.*` != "" ) then
     104                setenv ZLIB_ROOT "{$PETSC_ROOT}" # Used in installation of NetCDF, GDAL
     105                setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$PETSC_ROOT}/lib"
     106        endif
     107endif
     108
     109set SCOTCH_ROOT="{$ISSM_EXT_DIR}/scotch/install"
     110if ( -d "{$SCOTCH_ROOT}" ) then
     111        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$SCOTCH_ROOT}/lib"
     112endif
     113
     114set SLEPC_ROOT="{$ISSM_EXT_DIR}/slepc/install"
     115if ( -d "{$SLEPC_ROOT}" ) then
     116        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$SLEPC_ROOT}/lib"
     117endif
     118
     119set TAO_ROOT="{$ISSM_EXT_DIR}/tao/install"
     120if ( -d "{$TAO_ROOT}" ) then
     121        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$TAO_ROOT}/lib"
     122endif
     123
     124set DAKOTA_ROOT="{$ISSM_EXT_DIR}/dakota/install"
     125if ( -d "{$DAKOTA_ROOT}" ) then
     126        setenv PATH "{$PATH}:{$DAKOTA_ROOT}/bin"
     127        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$DAKOTA_ROOT}/lib"
     128        setenv DYLD_LIBRARY_PATH "{$DAKOTA_ROOT}/lib:{$DYLD_LIBRARY_PATH}"
     129endif
     130
     131set MERCURIAL_ROOT="{$ISSM_EXT_DIR}/mercurial/install"
     132if ( -d {$MERCURIAL_ROOT} ) then
     133        setenv PYTHONPATH "{$PYTHONPATH}:{$MERCURIAL_ROOT}/mercurial/pure"
     134        setenv PATH "{$PATH}:{$MERCURIAL_ROOT}"
     135endif
     136
     137set BOOST_ROOT="{$ISSM_EXT_DIR}/boost/install"
     138if ( -d {$BOOST_ROOT} ) then
     139        setenv BOOST_ROOT {$BOOST_ROOT} # Used in installation of Dakota
     140        setenv BOOST_DIR {$BOOST_ROOT}
     141        setenv BOOSTROOT {$BOOST_ROOT}
     142        setenv LIBRARY_PATH "{$BOOST_ROOT}/lib:{$LIBRARY_PATH}"
     143        setenv LD_LIBRARY_PATH "{$BOOST_ROOT}/lib:{$LD_LIBRARY_PATH}"
     144        setenv DYLD_LIBRARY_PATH "{$BOOST_ROOT}/lib:{$DYLD_LIBRARY_PATH}"
     145        setenv PATH "{$BOOST_ROOT}/bin:{$PATH}"
     146endif
     147
     148set GSL_ROOT="{$ISSM_EXT_DIR}/gsl/install"
     149if ( -d {$GSL_ROOT} ) then
     150        setenv GSL_HOME "{$GSL_ROOT}" # Used in installation of Dakota
     151        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$GSL_ROOT}/lib"
     152endif
     153
     154set NETCDF_ROOT="{$ISSM_EXT_DIR}/netcdf/install"
     155if ( -d "{$NETCDF_ROOT}" ) then
     156        setenv NETCDF_ROOT "{$NETCDF_ROOT}" # Used in installation of GDAL, GMT
     157        setenv PATH "{$PATH}:{$NETCDF_ROOT}/bin"
     158        setenv CPATH "{$CPATH}:{$NETCDF_ROOT}/include"
     159        setenv LIBRARY_PATH "{$LIBRARY_PATH}:{$NETCDF_ROOT}/lib"
     160        setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$NETCDF_ROOT}/lib"
     161        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$NETCDF_ROOT}/lib"
     162endif
     163
     164set CURL_ROOT="{$ISSM_EXT_DIR}/curl/install"
     165if ( -d "{$CURL_ROOT}" ) then
     166        setenv CURL_ROOT "{$CURL_ROOT}" # Used in installation of NetCDF, GDAL, GMT
     167        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$CURL_ROOT}/lib"
     168        setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$CURL_ROOT}/lib"
     169        setenv PATH "{$PATH}:{$CURL_ROOT}/bin"
     170endif
     171
     172set HDF5_ROOT="{$ISSM_EXT_DIR}/hdf5/install"
     173if ( -d "{$HDF5_ROOT}" ) then
     174        setenv HDF5_ROOT "{$HDF5_ROOT}" # Used in installation of NetCDF, GDAL
     175        setenv CPATH "{$CPATH}:{$HDF5_ROOT}/include"
     176        setenv LIBRARY_PATH "{$LIBRARY_PATH}:{$HDF5_ROOT}/lib"
     177        setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$HDF5_ROOT}/lib"
     178        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$HDF5_ROOT}/lib"
     179endif
     180
     181set SQLITE_ROOT="{$ISSM_EXT_DIR}/sqlite/install"
     182if ( -d "{$SQLITE_ROOT}" ) then
     183        setenv PATH "{$PATH}:{$SQLITE_ROOT}/bin"
     184        setenv LIBRARY_PATH "{$LIBRARY_PATH}:{$SQLITE_ROOT}/lib"
     185        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$SQLITE_ROOT}/lib"
     186endif
     187
     188set PROJ_ROOT="{$ISSM_EXT_DIR}/proj/install"
     189if ( -d "{$PROJ_ROOT}" ) then
     190        setenv PROJ_ROOT "${PROJ_ROOT}" # Used in installation of GDAL
     191        setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$PROJ_ROOT}/lib"
     192        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$PROJ_ROOT}/lib"
     193endif
     194
     195set GDAL_ROOT="{$ISSM_EXT_DIR}/gdal/install"
     196if ( -d "{$GDAL_ROOT}" ) then
     197        setenv GDAL_ROOT "{$GDAL_ROOT}" # Used in installation of GMT
     198        setenv PATH "{$GDAL_ROOT}/bin:{$PATH}"
     199        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$GDAL_ROOT}/lib"
     200endif
     201
     202set GSHHG_ROOT="{$ISSM_EXT_DIR}/gshhg/install"
     203if ( -d "{$GSHHG_ROOT}" ) then
     204        setenv GSHHG_ROOT "{$GSHHG_ROOT}" # Used in installation of GMT
     205endif
     206
     207set GMT_ROOT="{$ISSM_EXT_DIR}/gmt/install"
     208if ( -d "{$GMT_ROOT}" ) then
     209        setenv PATH "{$GMT_ROOT}/bin:{$PATH}"
     210        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$GMT_ROOT}/lib"
     211        setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$GMT_ROOT}/lib"
     212endif
     213
     214set GMSH_ROOT="{$ISSM_EXT_DIR}/gmsh/install"
     215if ( -d "{$GMSH_ROOT}" ) then
     216        setenv PATH "{$GMSH_ROOT}/bin:{$PATH}"
     217        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$GMSH_ROOT}/lib"
     218        setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$GMSH_ROOT}/lib"
     219endif
     220
     221set TRIANGLE_ROOT="{$ISSM_EXT_DIR}/triangle/install"
     222if ( -d "{$TRIANGLE_ROOT}" ) then
     223        setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$TRIANGLE_ROOT}/lib"
     224        setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$TRIANGLE_ROOT}/lib"
     225endif
     226
     227set YAMS_ROOT="{$ISSM_EXT_DIR}/yams/install"
     228if ( -d {$YAMS_ROOT} ) then
     229        setenv PATH "{$PATH}:{$YAMS_ROOT}"
     230endif
     231
     232set VALGRIND_ROOT="{$ISSM_EXT_DIR}/valgrind/install"
     233if ( -d {$VALGRIND_ROOT} ) then
     234        setenv PATH "{$VALGRIND_ROOT}/bin:{$PATH}"
     235endif
     236
     237set DOXYGEN_ROOT="{$ISSM_EXT_DIR}/doxygen/install"
     238if ( -d {$DOXYGEN_ROOT} ) then
     239        setenv PATH "{$DOXYGEN_ROOT}/bin:{$PATH}"
     240endif
     241
     242set SHELL2JUNIT_ROOT="{$ISSM_EXT_DIR}/shell2junit/install"
     243if ( -d {$SHELL2JUNIT_ROOT} ) then
     244        setenv PATH "{$PATH}:{$SHELL2JUNIT_ROOT}/install"
     245endif

  • issm/trunk-jpl/etc/environment.sh

    r25904 r25913  
    1010#
    1111
    12 # Silence no `zsh: no matches found: <file>`
     12# Silence `zsh: no matches found: <file>`
    1313setopt +o nomatch 1> /dev/null 2>&1
    1414
    … …  
    1717c_include_path_append(){ #{{{
    1818        if [ -d "${1}" ]; then
    19                 if [ -z $C_INCLUDE_PATH ]; then
     19                if [ -z "${C_INCLUDE_PATH}" ]; then
    2020                        export C_INCLUDE_PATH="${1}"
    2121                elif [[ ":${C_INCLUDE_PATH}:" != *":${1}:"* ]]; then
    … …  
    2626c_include_path_prepend(){ #{{{
    2727        if [ -d "${1}" ]; then
    28                 if [ -z $C_INCLUDE_PATH ]; then
     28                if [ -z "${C_INCLUDE_PATH}" ]; then
    2929                        export C_INCLUDE_PATH="${1}"
    3030                elif [[ ":${C_INCLUDE_PATH}:" != *":${1}:"* ]]; then
    … …  
    3636cpath_append(){ #{{{
    3737        if [ -d "${1}" ]; then
    38                 if [ -z $CPATH ]; then
     38                if [ -z "${CPATH}" ]; then
    3939                        export CPATH="${1}"
    4040                elif [[ ":${CPATH}:" != *":${1}:"* ]]; then
    … …  
    4545cpath_prepend(){ #{{{
    4646        if [ -d "${1}" ]; then
    47                 if [ -z $CPATH ]; then
     47                if [ -z "${CPATH}" ]; then
    4848                        export CPATH="${1}"
    4949                elif [[ ":${CPATH}:" != *":${1}:"* ]]; then
    … …  
    5555cplus_include_path_append(){ #{{{
    5656        if [ -d "${1}" ]; then
    57                 if [ -z $CPLUS_INCLUDE_PATH ]; then
     57                if [ -z "${CPLUS_INCLUDE_PATH}" ]; then
    5858                        export CPLUS_INCLUDE_PATH="${1}"
    5959                elif [[ ":${CPLUS_INCLUDE_PATH}:" != *":${1}:"* ]]; then
    … …  
    6464cplus_include_path_prepend(){ #{{{
    6565        if [ -d "${1}" ]; then
    66                 if [ -z $CPLUS_INCLUDE_PATH ]; then
     66                if [ -z "${CPLUS_INCLUDE_PATH}" ]; then
    6767                        export CPLUS_INCLUDE_PATH="${1}"
    6868                elif [[ ":${CPLUS_INCLUDE_PATH}:" != *":${1}:"* ]]; then
    … …  
    7474dyld_library_path_append(){ #{{{
    7575        if [ -d "${1}" ]; then
    76                 if [ -z $DYLD_LIBRARY_PATH ]; then
     76                if [ -z "${DYLD_LIBRARY_PATH}" ]; then
    7777                        export DYLD_LIBRARY_PATH="${1}"
    7878                elif [[ ":${DYLD_LIBRARY_PATH}:" != *":${1}:"* ]]; then
    7979                        export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${1}"
    8080                fi
    81                 if [ -z $LD_RUN_PATH ]; then
     81                if [ -z "${LD_RUN_PATH}" ]; then
    8282                        export LD_RUN_PATH=$1
    8383                elif [[ ":${LD_RUN_PATH}:" != *":${1}:"* ]]; then
    … …  
    8888dyld_library_path_prepend(){ #{{{
    8989        if [ -d "${1}" ]; then
    90                 if [ -z $DYLD_LIBRARY_PATH ]; then
     90                if [ -z "${DYLD_LIBRARY_PATH}" ]; then
    9191                        export DYLD_LIBRARY_PATH="${1}"
    9292                elif [[ ":${DYLD_LIBRARY_PATH}:" != *":${1}:"* ]]; then
    9393                        export DYLD_LIBRARY_PATH="${1}:${DYLD_LIBRARY_PATH}"
    9494                fi
    95                 if [ -z $LD_RUN_PATH ]; then
     95                if [ -z "${LD_RUN_PATH}" ]; then
    9696                        export LD_RUN_PATH="${1}"
    9797                elif [[ ":${LD_RUN_PATH}:" != *":${1}:"* ]]; then
    … …  
    103103ld_library_path_append(){ #{{{
    104104        if [ -d "${1}" ]; then
    105                 if [ -z $LD_LIBRARY_PATH ]; then
     105                if [ -z "${LD_LIBRARY_PATH}" ]; then
    106106                        export LD_LIBRARY_PATH="${1}"
    107107                elif [[ ":${LD_LIBRARY_PATH}:" != *":${1}:"* ]]; then
    108108                        export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${1}"
    109109                fi
    110                 if [ -z $LD_RUN_PATH ]; then
     110                if [ -z "${LD_RUN_PATH}" ]; then
    111111                        export LD_RUN_PATH="${1}"
    112112                elif [[ ":${LD_RUN_PATH}:" != *":$1:"* ]]; then
    … …  
    117117ld_library_path_prepend(){ #{{{
    118118        if [ -d "${1}" ]; then
    119                 if [ -z $LD_LIBRARY_PATH ]; then
     119                if [ -z "${LD_LIBRARY_PATH}" ]; then
    120120                        export LD_LIBRARY_PATH="${1}"
    121121                elif [[ ":${LD_LIBRARY_PATH}:" != *":${1}:"* ]]; then
    122122                        export LD_LIBRARY_PATH="${1}:${LD_LIBRARY_PATH}"
    123123                fi
    124                 if [ -z $LD_RUN_PATH ]; then
     124                if [ -z "${LD_RUN_PATH}" ]; then
    125125                        export LD_RUN_PATH="${1}"
    126126                elif [[ ":${LD_RUN_PATH}:" != *":${1}:"* ]]; then
    … …  
    132132library_path_append(){ #{{{
    133133        if [ -d "${1}" ]; then
    134                 if [ -z $LIBRARY_PATH ]; then
     134                if [ -z "${LIBRARY_PATH}" ]; then
    135135                        export LIBRARY_PATH="${1}"
    136136                elif [[ ":${LIBRARY_PATH}:" != *":$1:"* ]]; then
    … …  
    141141library_path_prepend(){ #{{{
    142142        if [ -d "${1}" ]; then
    143                 if [ -z $LIBRARY_PATH ]; then
     143                if [ -z "${LIBRARY_PATH}" ]; then
    144144                        export LIBRARY_PATH="${1}"
    145145                elif [[ ":${LIBRARY_PATH}:" != *":$1:"* ]]; then
    … …  
    173173fi
    174174
    175 # ISSM scripts
     175path_append "${ISSM_DIR}/aux-config"
    176176path_append "${ISSM_DIR}/scripts"
    177177
    … …  
    182182#########################
    183183SSH_ROOT="${ISSM_EXT_DIR}/ssh"
    184 path_append "${SSH_ROOT}"
     184if [ -d "${SSH_ROOT}" ]; then
     185        path_append "${SSH_ROOT}"
     186fi
    185187
    186188SVN_ROOT="${ISSM_EXT_DIR}/svn/install"
    … …  
    552554path_prepend "${DOXYGEN_ROOT}/bin"
    553555
    554 path_append "${ISSM_DIR}/aux-config"
    555 path_append "${ISSM_EXT_DIR}/shell2junit/install"
     556SHELL2JUNIT_ROOT="${ISSM_EXT_DIR}/shell2junit/install"
     557path_append "${SHELL2JUNIT_ROOT}"
Note: See TracChangeset for help on using the changeset viewer.