packages: openssl/openssl-c_rehash.sh - hardcode openssl path (make which d...
glen
glen at pld-linux.org
Thu Jul 8 16:06:47 CEST 2010
Author: glen Date: Thu Jul 8 14:06:47 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- hardcode openssl path (make which dependency optional)
---- Files affected:
packages/openssl:
openssl-c_rehash.sh (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/openssl/openssl-c_rehash.sh
diff -u packages/openssl/openssl-c_rehash.sh:1.6 packages/openssl/openssl-c_rehash.sh:1.7
--- packages/openssl/openssl-c_rehash.sh:1.6 Thu Jul 8 16:05:59 2010
+++ packages/openssl/openssl-c_rehash.sh Thu Jul 8 16:06:42 2010
@@ -165,9 +165,9 @@
# 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 @@
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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list