Remove MS repo

Author: XECDesign

debian/changelog

@@ -1,3 +1,9 @@
+raspberrypi-sys-mods (20210222) buster; urgency=medium
+
+  * Remove Microsoft repo, since it is no longer required
+
+ -- Serge Schneider <serge@raspberrypi.com>  Mon, 22 Feb 2021 19:11:43 +0000
+
 raspberrypi-sys-mods (20210208) buster; urgency=medium
 
   * Stop-gap measure to address one of the main concerns about 3rd party repos

debian/raspberrypi-sys-mods.postinst

@@ -28,55 +28,20 @@ check_audio () {
   fi
 }
 
-add_ms_repo () {
-	eval "$(apt-config shell APT_SOURCE_PARTS Dir::Etc::sourceparts/d)"
-	CODE_SOURCE_PART="${APT_SOURCE_PARTS}vscode.list"
-  if [ -f "$CODE_SOURCE_PART" ]; then
-    echo "Already exists. Skipped."
+remove_ms_repo () {
+  if dpkg -l code code-insiders code-exploration 2> /dev/null | grep -q '^ii'; then
+    echo "VS Code is installed. Skipped."
     return 0
   fi
-	eval "$(apt-config shell APT_TRUSTED_PARTS Dir::Etc::trustedparts/d)"
-	CODE_TRUSTED_PART="${APT_TRUSTED_PARTS}microsoft.gpg"
-
-	# Sourced from https://packages.microsoft.com/keys/microsoft.asc
-	if [ ! -f "$CODE_TRUSTED_PART" ]; then
-		echo "-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
-LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
-7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
-OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
-H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
-M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
-ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
-AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
-/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
-MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
-7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
-KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
-XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
-NdCFTW7wY0Fb1fWJ+/KTsC4=
-=J6gs
------END PGP PUBLIC KEY BLOCK-----
-" | gpg --dearmor > microsoft.gpg
-		mv microsoft.gpg "$CODE_TRUSTED_PART"
-	fi
-
-	# Install repository source list
-	WRITE_SOURCE=0
-	if [ ! -f "$CODE_SOURCE_PART" ]; then
-		# Write source list if it does not exist
-		WRITE_SOURCE=1
-	elif grep -q "# disabled on upgrade to" /etc/apt/sources.list.d/vscode.list; then
-		# Write source list if it was disabled by OS upgrade
-		WRITE_SOURCE=1
-	fi
-	if [ "$WRITE_SOURCE" -eq "1" ]; then
-		echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main" > "$CODE_SOURCE_PART"
-	fi
+  eval "$(apt-config shell APT_SOURCE_PARTS Dir::Etc::sourceparts/d)"
+  CODE_SOURCE_PART="${APT_SOURCE_PARTS}vscode.list"
+  if ! grep -vsq '^\s*$\|^\s*#' "$CODE_SOURCE_PART"; then
+    echo "vscode.list is missing or contains no data. Skipped."
+    return 0
+  fi
+  eval "$(apt-config shell APT_TRUSTED_PARTS Dir::Etc::trustedparts/d)"
+  CODE_TRUSTED_PART="${APT_TRUSTED_PARTS}microsoft.gpg"
+  rm -f "$CODE_SOURCE_PART" "$CODE_TRUSTED_PART" || true
 }
 
 case "${1}" in
@@ -119,9 +84,9 @@ case "${1}" in
       echo "Updating apt sources from {mirrordirector,archive}.raspbian.org to raspbian.raspberrypi.org..."
       find /etc/apt/sources.list* -type f -exec sed -i -E 's/(mirrordirector|archive)\.raspbian\.org/raspbian.raspberrypi.org/g' {} \;
     fi
-    if dpkg --compare-versions "${2}" lt-nl "20210125"; then
-      echo "Adding vscode repo..."
-      add_ms_repo
+    if dpkg --compare-versions "${2}" ge-nl "20210125" && dpkg --compare-versions "${2}" lt-nl "20210222"; then
+      echo "Removing vscode repo..."
+      remove_ms_repo
     fi
     ;;