summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2018-11-06 21:55:20 +0000
committerVincent Sanders <vince@kyllikki.org>2018-11-06 21:55:20 +0000
commit0bd66d4d040fdd5dc3894069720ba338541251cd (patch)
treeb42a1502d9cdd48cff8c5f2f5f192eeb89876974
parent5b235b519589b830c55e65b7ff5412ee62028d91 (diff)
downloadnetsurf-0bd66d4d040fdd5dc3894069720ba338541251cd.tar.gz
netsurf-0bd66d4d040fdd5dc3894069720ba338541251cd.tar.bz2
fix helper script apt packaging to work with buster
-rw-r--r--docs/env.sh5
1 files changed, 4 insertions, 1 deletions
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"