dietpi-distro-upgrade: fix Microsoft repo update

Each suite has its own repo and key. The repo is commonly installed as APT package, which contains both and should keep it updated in case of key rotations. A distro upgrade requires a new list+key package, at best installed before touching the existing list.

Author: MichaIng

.meta/dietpi-bookworm-upgrade

@@ -64,6 +64,13 @@ mapfile -t apackages < <(apt-mark showhold)
 unset -v apackages
 
 G_DIETPI-NOTIFY 2 'Migrating package lists to Bookworm suite'
+# Update Microsoft list properly: https://dietpi.com/blog/?p=3128#comment-6199
+if dpkg-query -s 'packages-microsoft-prod' 2> /dev/null | grep -q '^Status: install ok installed$'
+then
+	G_EXEC curl -sSf 'https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb'
+	G_EXEC dpkg -i --force-confnew packages-microsoft-prod.deb
+	G_EXEC rm packages-microsoft-prod.deb
+fi
 G_EXEC sed --follow-symlinks -i 's/bullseye/bookworm/g' /etc/apt/sources.list
 (( $G_RASPBIAN )) || G_EXEC sed --follow-symlinks -i -e 's/ non-free$/ non-free non-free-firmware/' -e 's/archive.debian.org/deb.debian.org/' /etc/apt/sources.list
 # Remove obsolete WSDD repo
@@ -81,7 +88,7 @@ G_DIETPI-NOTIFY 2 'Reverting some package lists to Bullseye which have no Bookwo
 [[ -f '/etc/apt/sources.list.d/radxa.list' ]] && G_EXEC sed --follow-symlinks -i 's/bookworm/bullseye/g' /etc/apt/sources.list.d/radxa.list
 [[ -f '/etc/apt/sources.list.d/dietpi-radxa.list' ]] && G_EXEC sed --follow-symlinks -i 's/bookworm/bullseye/g' /etc/apt/sources.list.d/dietpi-radxa.list
 
-if dpkg-query -s 'postgresql' &> /dev/null
+if dpkg-query -s 'postgresql' 2> /dev/null | grep -q '^Status: install ok installed$'
 then
 	G_DIETPI-NOTIFY 2 'Preventing automatic v15 main cluster generation'
 	G_CONFIG_INJECT 'create_main_cluster[[:blank:]]' 'create_main_cluster = false' /etc/postgresql-common/createcluster.conf

.meta/dietpi-trixie-upgrade

@@ -70,6 +70,13 @@ mapfile -t apackages < <(apt-mark showhold)
 unset -v apackages
 
 G_DIETPI-NOTIFY 2 'Migrating package lists to Trixie suite'
+# Update Microsoft list properly: https://dietpi.com/blog/?p=3128#comment-6199
+if dpkg-query -s 'packages-microsoft-prod' 2> /dev/null | grep -q '^Status: install ok installed$'
+then
+	G_EXEC curl -sSf 'https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb'
+	G_EXEC dpkg -i --force-confnew packages-microsoft-prod.deb
+	G_EXEC rm packages-microsoft-prod.deb
+fi
 G_EXEC sed --follow-symlinks -i 's/bookworm/trixie/g' /etc/apt/sources.list
 # Remove obsolete lists, including those obsoleted with Bookworm
 G_EXEC rm -f /etc/apt/sources.list.d/dietpi-{mono,wsdd}.list /etc/apt/trusted.gpg.d/dietpi-{mono,wsdd}.gpg
@@ -251,7 +258,7 @@ then
 fi
 
 # PostgreSQL migration
-if dpkg-query -s 'postgresql' &> /dev/null
+if dpkg-query -s 'postgresql' 2> /dev/null | grep -q '^Status: install ok installed$'
 then
 	G_DIETPI-NOTIFY 2 'Migrating PostgreSQL 15 clusters to v17'
 	mapfile -t clusters < <(pg_lsclusters | mawk '$1 == "15" {print $2}')