From 305d5422e443359b53e317a0bea4a4c48adec192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <raphael@offensive-security.com>
Date: Mon, 4 May 2020 18:30:09 +0200
Subject: [PATCH] Use a new default path for XFCE background

Hopefully this one will never change. It means we have the same image
twice but I prefer this over not having any background image at all when
we drop the old background.
---
 bin/update-default-backgrounds                           | 9 ++++++++-
 .../xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml   | 4 ++--
 share/backgrounds/kali-16x9/{kali-mesh.png => default}   | 0
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename share/backgrounds/kali-16x9/{kali-mesh.png => default} (100%)

diff --git a/bin/update-default-backgrounds b/bin/update-default-backgrounds
index 326cda62..a7a49ae0 100755
--- a/bin/update-default-backgrounds
+++ b/bin/update-default-backgrounds
@@ -4,6 +4,13 @@ DESTDIR=share/desktop-base/kali-theme/
 DESKTOP_BACKGROUND=$1
 LOGIN_BACKGROUND=$2
 
+# xfce background
+if [ -e share/backgrounds/kali-16x9/$DESKTOP_BACKGROUND.png ]; then
+    rm -f share/backgrounds/kali-16x9/default
+    mv share/backgrounds/kali-16x9/$DESKTOP_BACKGROUND.png \
+	share/backgrounds/kali-16x9/default
+fi
+
 # login/lockscreen
 ln -sfv ../../../backgrounds/kali/$LOGIN_BACKGROUND.xml ${DESTDIR}lockscreen/gnome-background.xml
 ln -sfv ../../../backgrounds/kali/$LOGIN_BACKGROUND-16x9.png ${DESTDIR}login/background
@@ -12,7 +19,7 @@ ln -sfv ../../../backgrounds/kali/$LOGIN_BACKGROUND.svg ${DESTDIR}login/backgrou
 # desktop background
 kde_wallpaper=$(echo $DESKTOP_BACKGROUND | sed -E 's/(^|-)([a-z])/\U\2/g')
 ln -sfv ../../../backgrounds/kali/$DESKTOP_BACKGROUND.xml ${DESTDIR}wallpaper/gnome-background.xml
-ln -sfv ../../../wallpapers/$kde_wallpaper/contents ${DESTDIR}wallpaper/contents
+ln -nsfv ../../../wallpapers/$kde_wallpaper/contents ${DESTDIR}wallpaper/contents
 
 sed -i "s/defaultWallpaperTheme=.*/defaultWallpaperTheme=${kde_wallpaper}/" share/plasma/desktoptheme/kali/metadata.desktop
 sed -i "s|/usr/share/backgrounds/kali-16x9/[^\"]*|/usr/share/backgrounds/kali-16x9/$DESKTOP_BACKGROUND.png|" \
diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index e0069672..30ea2d86 100644
--- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -15,12 +15,12 @@
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
       <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/backgrounds/kali-16x9/kali-mesh.png"/>
+        <property name="image-path" type="string" value="/usr/share/backgrounds/kali-16x9/default"/>
         <property name="image-style" type="int" value="5"/>
         <property name="image-show" type="bool" value="true"/>
       </property>
       <property name="monitor1" type="empty">
-        <property name="image-path" type="string" value="/usr/share/backgrounds/kali-16x9/kali-mesh.png"/>
+        <property name="image-path" type="string" value="/usr/share/backgrounds/kali-16x9/default"/>
         <property name="image-style" type="int" value="5"/>
         <property name="image-show" type="bool" value="true"/>
       </property>
diff --git a/share/backgrounds/kali-16x9/kali-mesh.png b/share/backgrounds/kali-16x9/default
similarity index 100%
rename from share/backgrounds/kali-16x9/kali-mesh.png
rename to share/backgrounds/kali-16x9/default