Merge branch 'kelduum-master-patch-63902' into 'master'

Update for changes to Bullseye

See merge request sympl/install!2

install.sh

@@ -42,7 +42,7 @@ fi
 clear
 echo
 echo "-----------------------------------------------------------------------"
-echo "                      Sympl Installer     v0.9"
+echo "                     Sympl Installer    v20210818                      "
 echo "-----------------------------------------------------------------------"
 echo
 echo "This script will help you install Sympl on a Debian Linux or Raspberry"
@@ -101,11 +101,13 @@ echo "roundcube-core roundcube/mysql/app-pass password" | debconf-set-selections
 echo "roundcube-core roundcube/reconfigure-webserver select apache2" | debconf-set-selections
 
 echo -n "Adding repository key..."
-wget -qO- https://mirror.mythic-beasts.com/mythic/support@mythic-beasts.com.gpg.key | apt-key add -
+wget -qO- https://mirror.mythic-beasts.com/mythic/support@mythic-beasts.com.gpg.key | apt-key add - 2>/dev/null
 
-if [ "$(find /etc/apt/sources.list.d/ -mindepth 1 -maxdepth 1 -type f -name 'sympl_*.list' | wc -l )" != "0" ]; then
+if [ "$(find /etc/apt/sources.list.d/ -mindepth 1 -maxdepth 1 -type f -name 'sympl_*.list' | wc -l )" != "0" ] \
+  || [ "$( grep -c '^deb http://packages.mythic-beasts.com/mythic/' /etc/apt/sources.list.d/* )" != "0" ]; then
   echo -n "Removing previous Sympl repo..."
   find /etc/apt/sources.list.d/ -mindepth 1 -maxdepth 1 -type f -name 'sympl_*.list' -delete
+  sed -i 's|^deb http://packages.mythic-beasts.com/mythic/.*|#&|' /etc/apt/sources.list.d/*
   echo "OK"
 fi