From 0305182380613ab1aaab9903298eff2031952036 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 25 Apr 2024 16:18:38 -0600 Subject: [PATCH 1/2] fix: Fix declaring the config data structure --- dist/debian/postinst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dist/debian/postinst b/dist/debian/postinst index 9a6e1133..df504276 100755 --- a/dist/debian/postinst +++ b/dist/debian/postinst @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2020, 2021, 2023 Humanitarian OpenStreetMap Team +# Copyright (c) 2020, 2021, 2023, 2024 Humanitarian OpenStreetMap Team # # This file is part of Underpass. # @@ -33,7 +33,12 @@ prompt() { eval $1 echo "Database configuration for ${config['title']} " - echo "# Database configuration for ${config['title']}" >> /etc/default/underpass + if test -w /etc/default/underpass; then + echo "# Database configuration for ${config['title']}" >> /etc/default/underpass + else + echo "ERROR: You don't have write permission to /etc/default/underpass" + exit + fi for i in ${!config[@]}; do if test x"$i" == x"title" -o x"$i" == x"prefix"; then @@ -85,8 +90,8 @@ if [ "$1" = "configure" ]; then touch /etc/default/underpass fi - prompt "$(declare -p config)" - + declare -A config + # For the Galaxy OSM Stats database config['title']="Underpass" config['prefix']="UNDERPASS" From 8d035a7d1c531fa1536a9e1873fcd491b0cd057b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 25 Apr 2024 16:19:15 -0600 Subject: [PATCH 2/2] fix: Improve the Depends list --- dist/debian/control | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dist/debian/control b/dist/debian/control index 8814d707..0cd382bf 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -57,16 +57,13 @@ Build-Depends: dpkg-dev (>= 1.13.19), Package: underpass Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libboost-filesystem-dev (>= 1.69), - libboost-program-options-dev (>= 1.69), - libboost-locale-dev (>= 1.69), - libboost-iostreams-dev (>= 1.69), - libgdal28 | libgdal26, - libxml++2.6-dev | libxml++3.0-dev, - libpqxx-7.6, - bzip2, - openssl, - postgis + libboost-all-dev (>= 1.69), + libxml++2.6 | libxml++2.6-2v5 | libxml++3.0, + libgdal26 | libgdal28 | libgdal31 | libgdal32 | libgdal33, + libpqxx-7.6, + bzip2, + openssl, + postgis Description: A daemon for processing OSM replication files. # Package: underpass-dbg