Simplify backgrounds diversion, now that there's only one file

This commit is contained in:
Arnaud Rebillout 2021-11-09 18:53:06 +07:00
parent b843f363e7
commit c47b78127b
No known key found for this signature in database
GPG Key ID: E725E87914600216
2 changed files with 18 additions and 21 deletions

View File

@ -107,15 +107,15 @@ if [ "$1" = "configure" ]; then
# Install remaining new files # Install remaining new files
install_all install_all
fi fi
# Disable some backgrounds in Gnome and KDE # Disable GNOME backgrounds
while read file; do file=/usr/share/gnome-background-properties/gnome-backgrounds.xml
mkdir -p "$(dirname $file)/disabled" if [ -e $file ]; then
dpkg-divert --rename --package kali-themes \ diverted_file=$(dirname $file)/disabled/$(basename $file)
--divert "$(dirname $file)/disabled/$(basename $file)" \ mkdir -p "$(dirname $diverted_file)"
--add "$file" dpkg-divert --rename --package kali-themes \
done << EOF --divert "$diverted_file" \
/usr/share/gnome-background-properties/gnome-backgrounds.xml --add "$file"
EOF fi
# Configure /root/.face to have a red-background avatar # Configure /root/.face to have a red-background avatar
if [ ! -e /root/.face ]; then if [ ! -e /root/.face ]; then
cp /usr/share/kali-themes/.face-root.svg /root/.face cp /usr/share/kali-themes/.face-root.svg /root/.face

View File

@ -41,18 +41,15 @@ case "$1" in
--divert "$file.original" \ --divert "$file.original" \
--remove "$file" --remove "$file"
done done
# Recover disabled backgrounds # Recover GNOME backgrounds
for dir in /usr/share/gnome-background-properties; do file=/usr/share/gnome-background-properties/gnome-backgrounds.xml
dpkg-divert --list "$dir/disabled/*" \ diverted_file=$(dirname $file)/disabled/$(basename $file)
| grep 'kali-themes$' \ if [ -e "$diverted_file" ]; then
| cut -d ' ' -f 3,5 \ dpkg-divert --rename --package kali-themes \
| while read file diverted_file; do --divert "$diverted_file" \
dpkg-divert --rename --package kali-themes \ --remove "$file"
--divert "$diverted_file" \ rmdir "$(dirname $diverted_file)" || :
--remove "$file" fi
done
rmdir "$dir/disabled"
done
;; ;;
esac esac