From 0bd66d4d040fdd5dc3894069720ba338541251cd Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 6 Nov 2018 21:55:20 +0000 Subject: [PATCH] fix helper script apt packaging to work with buster --- docs/env.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/env.sh b/docs/env.sh index b9adb92f9..39513cf0d 100644 --- a/docs/env.sh +++ b/docs/env.sh @@ -36,7 +36,10 @@ fi # apt get commandline to install necessary dev packages ns-apt-get-install() { - if /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then + LIBCURL_OPENSSL_CONFLICTS="$(/usr/bin/apt-cache show libcurl4-openssl-dev | grep Conflicts | grep -o libssl1.0-dev)" + if [ "x${LIBCURL_OPENSSL_CONFLICTS}" != "x" ]; then + NS_DEV_DEB="${NS_DEV_DEB} libssl-dev" + elif /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then NS_DEV_DEB="${NS_DEV_DEB} libssl1.0-dev" else NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"