From bc057dc1e6465c6f38783160e4befac7b9057dfb Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Thu, 19 Dec 2019 15:01:12 +0100 Subject: [PATCH] Fix mongodb cleanup Test: mongodb, -STOP- --- install-php-extensions | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install-php-extensions b/install-php-extensions index 37ea752..ed82ab4 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -269,7 +269,7 @@ buildRequiredPackageLists () { ;; imap@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent c-client" - if test -z "$(apk info | grep -E ^libssl)"; then + if test -z "$(apk info 2>/dev/null | grep -E ^libssl)"; then buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libssl1.0" fi buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile krb5-dev imap-dev libressl-dev" @@ -330,8 +330,10 @@ buildRequiredPackageLists () { ;; mongodb@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent icu-libs libsasl snappy" - if test -z "$(apk info | grep -E ^libssl)"; then + if test -z "$(apk info 2>/dev/null | grep -E ^libssl)"; then buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libssl1.0" + elif test -z "$(apk info 2>/dev/null | grep -E '^libressl.*-libtls')"; then + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libressl2.7-libtls" fi buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile icu-dev cyrus-sasl-dev snappy-dev libressl-dev zlib-dev" ;;