url-lib/module-setup.sh: fixed grepping libcurl

This commit is contained in:
Harald Hoyer 2013-07-30 15:25:44 +02:00
parent bf27e473cb
commit 27458b10ff

View File

@ -12,7 +12,7 @@ depends() {
} }
install() { install() {
local _dir _crt _found local _dir _crt _found _lib
inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh" inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh"
dracut_install curl dracut_install curl
# also install libs for curl https # also install libs for curl https
@ -23,7 +23,9 @@ install() {
for _dir in $libdirs; do for _dir in $libdirs; do
[[ -d $_dir ]] || continue [[ -d $_dir ]] || continue
_crt=$(grep -F --binary-files=text -z .crt $_dir/libcurl.so) for _lib in $_dir/libcurl.so.*; do
[[ -e $_lib ]] || continue
_crt=$(grep -F --binary-files=text -z .crt $_lib)
[[ $_crt ]] || continue [[ $_crt ]] || continue
[[ $_crt == /*/* ]] || continue [[ $_crt == /*/* ]] || continue
if ! inst_simple "$_crt"; then if ! inst_simple "$_crt"; then
@ -32,6 +34,7 @@ install() {
fi fi
_found=1 _found=1
done done
done
[[ $_found ]] || dwarn "Couldn't find SSL CA cert bundle; HTTPS won't work." [[ $_found ]] || dwarn "Couldn't find SSL CA cert bundle; HTTPS won't work."
} }