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

debian/kali-themes.postinst

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

debian/kali-themes.postrm

@@ -41,18 +41,15 @@ case "$1" in
 	            --divert "$file.original" \
 		    --remove "$file"
 	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 \
-            | while read file diverted_file; do
 	    dpkg-divert --rename --package kali-themes \
 			--divert "$diverted_file" \
 			--remove "$file"
-            done
+	    rmdir "$(dirname $diverted_file)" || :
-        rmdir "$dir/disabled"
+	fi
-    done
     ;;
 esac