Fix debian/kali-theme.preinst

2019-10-23 10:04:37 +02:00
parent bedfff8df1
commit 21d443ce6b
2 changed files with 15 additions and 2 deletions
@@ -1,3 +1,9 @@
+kali-themes (2019.4.2) kali-experimental; urgency=medium
+
+  * Fix debian/kali-theme.preinst
+
+ -- Sophie Brun <sophie@offensive-security.com>  Wed, 23 Oct 2019 10:05:30 +0200
+
 kali-themes (2019.4.1) kali-experimental; urgency=medium

  * Add missing Breaks and Replaces desktop-base
@@ -2,11 +2,18 @@

 set -e

+DIVERT_FILE="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
+
 case "$1" in
    install)
+	if [ "$(dpkg-divert --listpackage $DIVERT_FILE)" = "kali-defaults" ]; then
+	    dpkg-divert --rename --package kali-defaults \
+		--divert $DIVERT_FILE.original \
+                --remove $DIVERT_FILE
+	fi
 	dpkg-divert --rename --package kali-theme \
-		    --divert /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.original\
-		    --add /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+		    --divert $DIVERT_FILE.original \
+		    --add $DIVERT_FILE
    ;;
 esac