Review maintainer scripts

In prerm, don't drop the alternatives going through "active-theme" they are
the responsibility of desktop-base. In postinst, continue to create them
to update them in case the new kali theme provides the file that the
former theme did not.

Fix the check protecteding the call to plymouth-set-default to use a
version that actually existed in kali-themes even though we don't really
have an upgrade case where we wanted to call the command. But it will
make it easier to force a re-run in the future, in case we change the
name of the plymouth theme.
This commit is contained in:
Raphaël Hertzog 2019-11-01 19:47:11 +01:00
parent bc5a081abf
commit e9aebab34e
2 changed files with 3 additions and 43 deletions

View File

@ -196,8 +196,9 @@ EOF
fi
# Set Kali as default plymouth theme
if [ "${1}" = "configure" ] && dpkg --compare-versions "$2" lt "10.0.2+kali3"; then
# Set Kali as default plymouth theme (on initial install and upgrade from
# old version)
if [ "${1}" = "configure" ] && dpkg --compare-versions "$2" lt "2019.4.0"; then
if which plymouth-set-default-theme > /dev/null; then
plymouth-set-default-theme kali
if which update-initramfs > /dev/null; then

View File

@ -24,8 +24,6 @@ kali 2560x1440.svg
kali 2560x1600.svg
kali 3840x2160.svg
EOF
# *Last* remove background *highest priority* alternatives for active theme
update-alternatives --remove desktop-background /usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg
# Remove desktop-background.xml alternatives
# For theme packages
@ -36,10 +34,6 @@ EOF
done << EOF
kali
EOF
# *Lastly* remove *highest priority* alternative for active theme
update-alternatives --remove \
desktop-background.xml \
/usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml
# Remove desktop-lockscreen.xml alternatives
# For theme packages
@ -50,10 +44,6 @@ EOF
done << EOF
kali
EOF
# *Last* remove *highest priority* alternative for active theme
update-alternatives --remove \
desktop-lockscreen.xml \
/usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml
# Remove Plasma 5/KDE wallpaper alternatives
# For theme packages
@ -64,10 +54,6 @@ EOF
done << EOF
kali
EOF
# *Last* remove *highest priority* alternative for active theme
update-alternatives --remove \
desktop-plasma5-wallpaper \
/usr/share/desktop-base/active-theme/wallpaper
# Remove login theme alternatives
# For theme packages
@ -79,10 +65,6 @@ EOF
done << EOF
kali background.svg
EOF
# *Last* remove *highest priority* alternative for active theme
update-alternatives --remove \
desktop-login-background \
/usr/share/desktop-base/active-theme/login/background.svg
# Remove GRUB alternatives
# Remove alternative for the GRUB background/colors config
@ -105,25 +87,6 @@ EOF
kali 4x3
kali 16x9
EOF
## *Lastly* remove *highest priority* alternative
num_grub_efi_installed=$(dpkg-query --list "grub-efi*" 2> /dev/null | grep "^i" | wc -l)
if [ $num_grub_efi_installed -gt 0 ] ; then
remove_first_ratio=4x3
remove_last_ratio=16x9
else
remove_first_ratio=16x9
remove_last_ratio=4x3
fi
update-alternatives --remove \
desktop-grub.sh \
/usr/share/desktop-base/active-theme/grub/grub_background.sh
update-alternatives --remove \
desktop-grub \
/usr/share/desktop-base/active-theme/grub/grub-$remove_first_ratio.png
update-alternatives --remove \
desktop-grub \
/usr/share/desktop-base/active-theme/grub/grub-$remove_last_ratio.png
# Remove theme package alternatives
while read theme; do
@ -133,10 +96,6 @@ EOF
done << EOF
kali
EOF
## *Lastly* remove *highest priority* alternative
update-alternatives --remove \
desktop-theme \
/usr/share/desktop-base/futureprototype-theme
fi