diff --git a/Makefile b/Makefile index 245ff44a..1ebd8e7c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SUBDIRS=emblems kali-logos xfce-panel-profiles -DESKTOP_BACKGROUND=kali-ferrofluid -LOGIN_BACKGROUND=kali-aqua +DESKTOP_BACKGROUND=kali-ferrofluid.jpg +LOGIN_BACKGROUND=kali-aqua.jpg build: bin/update-default-backgrounds $(DESKTOP_BACKGROUND) $(LOGIN_BACKGROUND) diff --git a/bin/update-default-backgrounds b/bin/update-default-backgrounds index b83a2cc0..55b2cb79 100755 --- a/bin/update-default-backgrounds +++ b/bin/update-default-backgrounds @@ -1,12 +1,14 @@ #!/bin/sh DESTDIR=share/desktop-base/kali-theme/ -DESKTOP_BACKGROUND=$1 -LOGIN_BACKGROUND=$2 +DESKTOP_BACKGROUND=$(echo $1 | sed 's/\..\+//') +DESKTOP_BACKGROUND_EXTENSION=$(echo $1 | grep -o '\..\+') +LOGIN_BACKGROUND=$(echo $2 | sed 's/\..\+//') +LOGIN_BACKGROUND_EXTENSION=$(echo $2 | grep -o '\..\+') # 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 +ln -sfv ../../../backgrounds/kali/$LOGIN_BACKGROUND-16x9${LOGIN_BACKGROUND_EXTENSION} ${DESTDIR}login/background # desktop background kde_wallpaper=$(echo $DESKTOP_BACKGROUND | sed -E 's/(^|-)([a-z])/\U\2/g') @@ -17,4 +19,4 @@ sed -i "s/defaultWallpaperTheme=.*/defaultWallpaperTheme=${kde_wallpaper}/" shar # default background symlink for XFCE mkdir -p share/backgrounds/kali-16x9 -ln -sf $DESKTOP_BACKGROUND.png share/backgrounds/kali-16x9/default +ln -sf $DESKTOP_BACKGROUND${DESKTOP_BACKGROUND_EXTENSION} share/backgrounds/kali-16x9/default diff --git a/debian/changelog b/debian/changelog index d25fa151..3d508f34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ kali-themes (2024.1.0) kali-dev; urgency=medium * Depend on 2024 wallpapers package * Add bottom black gradient to iso boot background * Configure new default wallpapers + * Use jpg file for background and login images - -- Daniel Ruiz de Alegría Mon, 22 Jan 2024 13:32:57 +0100 + -- Daniel Ruiz de Alegría Mon, 22 Jan 2024 14:46:04 +0100 kali-themes (2023.4.5) kali-dev; urgency=medium diff --git a/share/backgrounds/kali-16x9/default b/share/backgrounds/kali-16x9/default index 4d0debfa..5989c2ba 120000 --- a/share/backgrounds/kali-16x9/default +++ b/share/backgrounds/kali-16x9/default @@ -1 +1 @@ -kali-ferrofluid.png \ No newline at end of file +kali-ferrofluid.jpg \ No newline at end of file diff --git a/share/desktop-base/kali-theme/login/background b/share/desktop-base/kali-theme/login/background index 6a1abbf0..e74b63cd 120000 --- a/share/desktop-base/kali-theme/login/background +++ b/share/desktop-base/kali-theme/login/background @@ -1 +1 @@ -../../../backgrounds/kali/kali-aqua-16x9.png \ No newline at end of file +../../../backgrounds/kali/kali-aqua-16x9.jpg \ No newline at end of file