Dynamically showing distribution specific repositories to setup.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 92 insertions, 211 deletions

diff --git a/debian/po/de.po b/debian/po/de.po
index 5002a6a..a36ef6a 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux 20181201-3\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-01-30 03:38+0100\n"
+"POT-Creation-Date: 2019-02-08 22:04+0100\n"
 "PO-Revision-Date: 2019-02-02 07:55+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -21,85 +21,25 @@ msgid "Progress Linux: Setup"
 msgstr "Progress Linux: Einrichtung"
 
 #. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck)"
-msgstr "Progress Linux 5 (engywuck)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-security)"
-msgstr "Progress Linux 5 (engywuck-security)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-updates)"
-msgstr "Progress Linux 5 (engywuck-updates)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-extras)"
-msgstr "Progress Linux 5 (engywuck-extras)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5+ (engywuck-backports)"
-msgstr "Progress Linux 5+ (engywuck-backports)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5+ (engywuck-backports-extras)"
-msgstr "Progress Linux 5+ (engywuck-backports-extras)"
-
-#. Type: multiselect
 #. Description
-#: ../progress-linux.templates:2002
+#: ../progress-linux.templates:2001
 msgid "setup apt archives:"
 msgstr "Apt-Archive einrichten:"
 
 #. Type: multiselect
 #. Description
-#: ../progress-linux.templates:2002
+#: ../progress-linux.templates:2001
 msgid "Please select the apt archives to setup."
 msgstr "Bitte wählen Sie die einzurichtenden Apt-Archive aus."
 
 #. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "main"
-msgstr "main"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "contrib"
-msgstr "contrib"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "non-free"
-msgstr "non-free"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "restricted"
-msgstr "restricted"
-
-#. Type: multiselect
 #. Description
-#: ../progress-linux.templates:3002
+#: ../progress-linux.templates:3001
 msgid "setup apt archive areas:"
 msgstr "Apt-Archivbereiche einrichten:"
 
 #. Type: multiselect
 #. Description
-#: ../progress-linux.templates:3002
+#: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr "Bitte wählen Sie die einzurichtenden Apt-Archivbereiche aus."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 521d14e..caf9cee 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux 20181201-3\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-01-30 03:38+0100\n"
+"POT-Creation-Date: 2019-02-08 22:04+0100\n"
 "PO-Revision-Date: 2019-02-03 10:00+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -22,85 +22,25 @@ msgid "Progress Linux: Setup"
 msgstr "Progress Linux: Configuração"
 
 #. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck)"
-msgstr "Progress Linux 5 (engywuck)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-security)"
-msgstr "Progress Linux 5 (engywuck-security)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-updates)"
-msgstr "Progress Linux 5 (engywuck-updates)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-extras)"
-msgstr "Progress Linux 5 (engywuck-extras)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5+ (engywuck-backports)"
-msgstr "Progress Linux 5+ (engywuck-backports)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5+ (engywuck-backports-extras)"
-msgstr "Progress Linux 5+ (engywuck-backports-extras)"
-
-#. Type: multiselect
 #. Description
-#: ../progress-linux.templates:2002
+#: ../progress-linux.templates:2001
 msgid "setup apt archives:"
 msgstr "configurar arquivos do apt:"
 
 #. Type: multiselect
 #. Description
-#: ../progress-linux.templates:2002
+#: ../progress-linux.templates:2001
 msgid "Please select the apt archives to setup."
 msgstr "Por favor escolha os arquivos apt a configurar."
 
 #. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "main"
-msgstr "main (principal)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "contrib"
-msgstr "contrib (contributos)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "non-free"
-msgstr "non-free (não livre)"
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "restricted"
-msgstr "restricted (restrito)"
-
-#. Type: multiselect
 #. Description
-#: ../progress-linux.templates:3002
+#: ../progress-linux.templates:3001
 msgid "setup apt archive areas:"
 msgstr "configurar áreas de arquivo do apt:"
 
 #. Type: multiselect
 #. Description
-#: ../progress-linux.templates:3002
+#: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr "Por favor escolha as áreas do arquivo apt a configurar."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 8f5d135..b2fbba3 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-01-30 03:38+0100\n"
+"POT-Creation-Date: 2019-02-08 22:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,85 +24,25 @@ msgid "Progress Linux: Setup"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck)"
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-security)"
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-updates)"
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5 (engywuck-extras)"
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5+ (engywuck-backports)"
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:2001
-msgid "Progress Linux 5+ (engywuck-backports-extras)"
-msgstr ""
-
-#. Type: multiselect
 #. Description
-#: ../progress-linux.templates:2002
+#: ../progress-linux.templates:2001
 msgid "setup apt archives:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../progress-linux.templates:2002
+#: ../progress-linux.templates:2001
 msgid "Please select the apt archives to setup."
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "main"
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "contrib"
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "non-free"
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#: ../progress-linux.templates:3001
-msgid "restricted"
-msgstr ""
-
-#. Type: multiselect
 #. Description
-#: ../progress-linux.templates:3002
+#: ../progress-linux.templates:3001
 msgid "setup apt archive areas:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../progress-linux.templates:3002
+#: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr ""
diff --git a/debian/progress-linux.config b/debian/progress-linux.config
index 99b7a02..6655630 100755
--- a/debian/progress-linux.config
+++ b/debian/progress-linux.config
@@ -6,17 +6,35 @@ PROJECT="progress-linux"
 
 . /usr/share/debconf/confmodule
 
-# apt archives
-db_settitle ${PROJECT}/title
-db_input high ${PROJECT}/archives || true
-db_go
-
-if db_get ${PROJECT}/archives
-then
-	# apt archive-areas
+Run_debconf ()
+{
+	# apt archives
 	db_settitle ${PROJECT}/title
-	db_input high ${PROJECT}/archive-areas || true
+	db_input high ${PROJECT}/archives || true
 	db_go
-fi
+
+	if db_get ${PROJECT}/archives
+	then
+		# apt archive-areas
+		db_settitle ${PROJECT}/title
+		db_input high ${PROJECT}/archive-areas || true
+		db_go
+	fi
+}
+
+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}/archives DEFAULT ""
+
+		db_subst ${PROJECT}/archive-areas CHOICES "main, contrib, non-free, restricted"
+		db_subst ${PROJECT}/archive-areas DEFAULT "main"
+
+		Run_debconf
+		;;
+esac
 
 db_stop
diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst
index 959e4e8..ceb563d 100755
--- a/debian/progress-linux.postinst
+++ b/debian/progress-linux.postinst
@@ -97,6 +97,27 @@ EOF
 	fi
 }
 
+Remove_ssh_known_hosts ()
+{
+	if [ ! -e /etc/ssh/ssh_known_hosts ]
+	then
+		return
+	fi
+
+	# ssh cert-authority
+	grep -v "^@cert-authority \*.${DOMAIN}" /etc/ssh/ssh_known_hosts > /etc/ssh/ssh_known_hosts.tmp
+
+	if [ "$(md5sum /etc/ssh/ssh_known_hosts.tmp | cut -d' ' -f1)" = "2a2b4fdd70705b2029b35a24217138e6" ]
+	then
+		rm -f /etc/ssh/ssh_known_hosts.tmp
+		rm -f /etc/ssh/ssh_known_hosts
+
+		rmdir /etc/ssh > /dev/null 2>&1 || true
+	else
+		mv -f /etc/ssh/ssh_known_hosts.tmp /etc/ssh/ssh_known_hosts
+	fi
+}
+
 case "${1}" in
 	configure)
 		. /usr/share/debconf/confmodule
@@ -109,8 +130,25 @@ case "${1}" in
 
 		db_stop
 
+		DISTRIBUTION="$(cat /etc/debian_version)"
+
+		case "${DISTRIBUTION}" in
+			10.*|buster/sid)
+				;;
+
+			*)
+				Remove_apt_sources
+				Remove_apt_preferences
+				Remove_apt_keys
+
+				Remove_ssh_known_hosts
+
+				exit 0
+				;;
+		esac
+
 		# apt
-		if [ -n "${ARCHIVES}" ]
+		if [ -n "${ARCHIVES}" ] && [ "${ARCHIVES}" != "false" ]
 		then
 			Install_apt_sources
 			Install_apt_preferences
diff --git a/debian/progress-linux.postrm b/debian/progress-linux.postrm
index 086b5ff..391291d 100755
--- a/debian/progress-linux.postrm
+++ b/debian/progress-linux.postrm
@@ -25,6 +25,11 @@ Remove_apt_keys ()
 
 Remove_ssh_known_hosts ()
 {
+	if [ ! -e /etc/ssh/ssh_known_hosts ]
+	then
+		return
+	fi
+
 	# ssh cert-authority
 	grep -v "^@cert-authority \*.${DOMAIN}" /etc/ssh/ssh_known_hosts > /etc/ssh/ssh_known_hosts.tmp
 
diff --git a/debian/progress-linux.templates b/debian/progress-linux.templates
index a2a4ca2..19eada0 100644
--- a/debian/progress-linux.templates
+++ b/debian/progress-linux.templates
@@ -4,15 +4,15 @@ _Description: Progress Linux: Setup
 
 Template: progress-linux/archives
 Type: multiselect
-Choices-C: engywuck, engywuck-security, engywuck-updates, engywuck-extras, engywuck-backports, engywuck-backports-extras
-__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)
-Default: 
+Choices: ${CHOICES}
+Choices-C: ${CHOICES_C}
+Default: ${DEFAULT}
 _Description: setup apt archives:
  Please select the apt archives to setup.
 
 Template: progress-linux/archive-areas
 Type: multiselect
-__Choices: main, contrib, non-free, restricted
-Default: main
+Choices: ${CHOICES}
+Default: ${DEFAULT}
 _Description: setup apt archive areas:
  Please select the apt archive areas to setup.