- versioned Obsoletes

[packages/openssl.git] / openssl-c_rehash.sh

diff --git a/openssl-c_rehash.sh b/openssl-c_rehash.sh
index 90da18fb947592403d04863deb625b08dbb91fd4..0ea22637ee6dbce845a9e2caf62540aaaf5d0761 100644 (file)
--- a/openssl-c_rehash.sh
+++ b/openssl-c_rehash.sh
@@ -140,7 +140,7 @@ hash_dir()
         fi
     done
 
-    ls -1 *.pem 2>/dev/null | while read FILE
+    ls -1 *.pem *.cer *.crt *.crl 2>/dev/null | while read FILE
     do
        check_file ${FILE}
         local FILE_TYPE=${?}
@@ -165,9 +165,9 @@ hash_dir()
 # choose the name of an ssl application
 if [ -n "${OPENSSL}" ]
 then
-    SSL_CMD=${OPENSSL}
+    SSL_CMD=$(which ${OPENSSL} 2>/dev/null)
 else
-    SSL_CMD=openssl
+    SSL_CMD=/usr/bin/openssl
     OPENSSL=${SSL_CMD}
     export OPENSSL
 fi
@@ -177,7 +177,7 @@ PATH=${PATH}:${DIR}/bin
 export PATH
 
 # confirm existance/executability of ssl command
-if ! [ -x $( which ${SSL_CMD} ) ]
+if ! [ -x ${SSL_CMD} ]
 then
     echo "${0}: rehashing skipped ('openssl' program not available)" >&2
     exit 0