Changeset 25858

Timestamp:

12/12/20 13:22:56 (4 years ago)

Author:

jdquinn

Message:

CHG: Converting find -> ls to avoid warnings under zsh

File:

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

issm/trunk-jpl/etc/environment.sh

@@ -262 +262 @@
 
         # BLAS
-        NUM_BLAS_LIBS=$(find ${PETSC_ROOT}/lib -name libblas.* -o -name libfblas.* | wc -l)
-        if [ ${NUM_BLAS_LIBS} -gt 0 ]; then
+        if ls ${PETSC_ROOT}/lib/libblas.* 1> /dev/null 2>&1 || ls ${PETSC_ROOT}/lib/libfblas.* 1> /dev/null 2>&1; then
                 export BLAS_ROOT="${PETSC_ROOT}" # Used in installation of Dakota, GMT
         fi
 
         # HDF5
-        NUM_HDF5_LIBS=$(find ${PETSC_ROOT}/lib -name libhdf5.* | wc -l)
-        if [ ${NUM_HDF5_LIBS} -gt 0 ]; then
+        if ls ${PETSC_ROOT}/lib/libhdf5.* 1> /dev/null 2>&1; then
                 export HDF5_ROOT="${PETSC_ROOT}" # Used in installation of NetCDF, GDAL
                 cpath_append "${PETSC_ROOT}/include"
@@ -278 +276 @@
 
         # LAPACK
-        NUM_LAPACK_LIBS=$(find ${PETSC_ROOT}/lib -name liblapack.* -o -name libflapack.* | wc -l)
-        if [ ${NUM_LAPACK_LIBS} -gt 0 ]; then
+        if ls ${PETSC_ROOT}/lib/liblapack.* 1> /dev/null 2>&1 || ls ${PETSC_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then
                 export LAPACK_ROOT="${PETSC_ROOT}" # Used in installation of Dakota, GMT
         fi
 
         # METIS
-        NUM_METIS_LIBS=$(find ${PETSC_ROOT}/lib -name libmetis.* | wc -l)
-        if [ ${NUM_METIS_LIBS} -gt 0 ]; then
+        if ls ${PETSC_ROOT}/lib/libmetis.* 1> /dev/null 2>&1; then
                 export METIS_ROOT="${PETSC_ROOT}" # Used in installation of Gmsh
         fi
@@ -301 +297 @@
 
         # ZLIB
-        NUM_ZLIB_LIBS=$(find ${PETSC_ROOT}/lib -name libz.* | wc -l)
-        if [ ${NUM_ZLIB_LIBS} -gt 0 ]; then
+        if ls ${PETSC_ROOT}/lib/libz.* 1> /dev/null 2>&1; then
                 export ZLIB_ROOT="${PETSC_ROOT}" # Used in installation of NetCDF, GDAL
         fi