From 65bca1ea34d09e2ff077ad871063f67520bf1fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Mon, 4 May 2020 15:43:30 +0200 Subject: [PATCH] Use alternatives pointing to "kali-theme" and not "active-theme" The path with "active-theme" are already "managed" by desktop-base and we don't want an install+removal of desktop-base to mess with the alternatives that we have setup in kali-desktop-base. Restore the removal code for alternatives that were voluntarily shared with desktop-base. --- debian/kali-desktop-base.postinst | 8 ++++---- debian/kali-desktop-base.prerm | 24 ++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/debian/kali-desktop-base.postinst b/debian/kali-desktop-base.postinst index 5d25def3..6ff10407 100644 --- a/debian/kali-desktop-base.postinst +++ b/debian/kali-desktop-base.postinst @@ -36,23 +36,23 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov # (for GNOME) update-alternatives --install \ /usr/share/images/desktop-base/desktop-background.xml \ - desktop-background.xml /usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml 210 + desktop-background.xml /usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml 210 # Set up an alternative for the XML version of the lock screen # (for GNOME) update-alternatives --install \ /usr/share/images/desktop-base/desktop-lockscreen.xml \ - desktop-lockscreen.xml /usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml 210 + desktop-lockscreen.xml /usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml 210 # Set up an alternative for the wallpaper for Plasma 5/KDE update-alternatives --install \ /usr/share/wallpapers/DebianTheme \ - desktop-plasma5-wallpaper /usr/share/desktop-base/active-theme/wallpaper 210 + desktop-plasma5-wallpaper /usr/share/desktop-base/kali-theme/wallpaper 210 # Login theme # Highest priority for active theme update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ - desktop-login-background /usr/share/desktop-base/active-theme/login/background.svg 210 + desktop-login-background /usr/share/desktop-base/kali-theme/login/background.svg 210 # Set up an alternative for the GRUB background/colors config # Highest priority for active theme diff --git a/debian/kali-desktop-base.prerm b/debian/kali-desktop-base.prerm index d5329c8f..39ab0173 100644 --- a/debian/kali-desktop-base.prerm +++ b/debian/kali-desktop-base.prerm @@ -12,13 +12,33 @@ if [ "$1" = "remove" ]; then desktop-background \ /usr/share/desktop-base/kali-theme/wallpaper/contents/images/3840x2160.png + # Remove desktop-background.xml alternatives + update-alternatives --remove \ + desktop-background.xml \ + /usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml + + # Remove desktop-lockscreen.xml alternatives + update-alternatives --remove \ + desktop-lockscreen.xml \ + /usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml + + # Remove Plasma 5/KDE wallpaper alternatives + update-alternatives --remove \ + desktop-plasma5-wallpaper \ + /usr/share/desktop-base/kali-theme/wallpaper + + # Remove login theme alternatives + update-alternatives --remove \ + desktop-login-background \ + /usr/share/desktop-base/kali-theme/login/background.svg + # Remove GRUB alternatives update-alternatives --remove \ desktop-grub \ - /boot/grub/themes/kali/grub-4x3.png + /usr/share/grub/themes/kali/grub-4x3.png update-alternatives --remove \ desktop-grub \ - /boot/grub/themes/kali/grub-16x9.png + /usr/share/grub/themes/kali/grub-16x9.png # Remove theme package alternatives update-alternatives --remove \