From d0a293422af2193caf05279e2e156a601c621ed8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Jul 2019 00:01:50 +0200
Subject: Generalizing distribution handling in debconf.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/progress-linux.config   | 15 +++++++++++----
 debian/progress-linux.postinst |  3 +++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/progress-linux.config b/debian/progress-linux.config
index fc96575..5761d9e 100755
--- a/debian/progress-linux.config
+++ b/debian/progress-linux.config
@@ -8,6 +8,11 @@ PROJECT="progress-linux"
 
 Run_debconf ()
 {
+	# debconf templates
+	db_subst ${PROJECT}/archives CHOICES "Progress Linux ${RELEASE} (${CODENAME}), Progress Linux ${RELEASE} (${CODENAME}-security), Progress Linux ${RELEASE} (${CODENAME}-updates), Progress Linux ${RELEASE} (${CODENAME}-extras), Progress Linux ${RELEASE}+ (${CODENAME}-backports), Progress Linux ${RELEASE}+ (${CODENAME}-backports-extras)"
+	db_subst ${PROJECT}/archives CHOICES_C "${CODENAME}, ${CODENAME}-security, ${CODENAME}-updates, ${CODENAME}-extras, ${CODENAME}-backports, ${CODENAME}-backports-extras"
+	db_subst ${PROJECT}/archive-areas CHOICES "main, contrib, non-free, restricted"
+
 	# apt archives
 	db_settitle ${PROJECT}/title
 	db_input high ${PROJECT}/archives || true
@@ -26,13 +31,15 @@ DISTRIBUTION="$(cat /etc/debian_version)"
 
 case "${DISTRIBUTION}" in
 	10.*|buster/sid)
-		db_subst ${PROJECT}/archives CHOICES "Progress Linux 5 (engywuck), Progress Linux 5 (engywuck-security), Progress Linux 5 (engywuck-updates), Progress Linux 5 (engywuck-extras), Progress Linux 5+ (engywuck-backports), Progress Linux 5+ (engywuck-backports-extras)"
-		db_subst ${PROJECT}/archives CHOICES_C "engywuck, engywuck-security, engywuck-updates, engywuck-extras, engywuck-backports, engywuck-backports-extras"
-
-		db_subst ${PROJECT}/archive-areas CHOICES "main, contrib, non-free, restricted"
+		RELEASE="5"
+		CODENAME="engywuck"
 
 		Run_debconf
 		;;
+
+	*)
+		echo "W: unsupported debian release"
+		;;
 esac
 
 db_stop
diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst
index c5891f4..96271df 100755
--- a/debian/progress-linux.postinst
+++ b/debian/progress-linux.postinst
@@ -134,9 +134,12 @@ case "${1}" in
 
 		case "${DISTRIBUTION}" in
 			10.*|buster/sid)
+
 				;;
 
 			*)
+				echo "W: unsupported debian release"
+
 				Remove_apt_sources
 				Remove_apt_preferences
 				Remove_apt_keys
-- 
cgit v1.2.3