diff --git a/config/desktop/focal/environments/budgie/armbian/create_desktop_package.sh b/config/desktop/focal/environments/budgie/armbian/create_desktop_package.sh index a2c1550ad8..af38a34f5a 100755 --- a/config/desktop/focal/environments/budgie/armbian/create_desktop_package.sh +++ b/config/desktop/focal/environments/budgie/armbian/create_desktop_package.sh @@ -11,12 +11,15 @@ cp "${SRC}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/shar # install wallpapers mkdir -p "${destination}"/usr/share/backgrounds/armbian/ -cp "${SRC}"/packages/blobs/desktop/wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian +cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian # install wallpapers mkdir -p "${destination}"/usr/share/backgrounds/armbian-lightdm/ cp "${SRC}"/packages/blobs/desktop/lightdm-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian-lightdm +# install logo for login screen +cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian + #generate wallpaper list for background changer mkdir -p "${destination}"/usr/share/cinnamon-background-properties cat < "${destination}"/usr/share/cinnamon-background-properties/armbian.xml diff --git a/config/desktop/focal/environments/cinnamon/armbian/create_desktop_package.sh b/config/desktop/focal/environments/cinnamon/armbian/create_desktop_package.sh index a2c1550ad8..4a66f38792 100755 --- a/config/desktop/focal/environments/cinnamon/armbian/create_desktop_package.sh +++ b/config/desktop/focal/environments/cinnamon/armbian/create_desktop_package.sh @@ -17,6 +17,9 @@ cp "${SRC}"/packages/blobs/desktop/wallpapers/*.jpg "${destination}"/usr/share/b mkdir -p "${destination}"/usr/share/backgrounds/armbian-lightdm/ cp "${SRC}"/packages/blobs/desktop/lightdm-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian-lightdm +# install logo for login screen +cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian + #generate wallpaper list for background changer mkdir -p "${destination}"/usr/share/cinnamon-background-properties cat < "${destination}"/usr/share/cinnamon-background-properties/armbian.xml diff --git a/config/desktop/focal/environments/xfce/armbian/create_desktop_package.sh b/config/desktop/focal/environments/xfce/armbian/create_desktop_package.sh index 5f9e3aa663..5ae5d4a875 100644 --- a/config/desktop/focal/environments/xfce/armbian/create_desktop_package.sh +++ b/config/desktop/focal/environments/xfce/armbian/create_desktop_package.sh @@ -5,17 +5,17 @@ cp -R "${SRC}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian mkdir -p "${destination}"/etc/skel cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel -#install desktop bar icons +#install cinnamon desktop bar icons mkdir -p "${destination}"/usr/share/icons/armbian cp "${SRC}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/share/icons/armbian -# using different icon pack. Workaround due to this bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867779 -sed -i 's//g' \ -"${destination}"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +# install wallpapers +mkdir -p "${destination}"/usr/share/backgrounds/armbian/ +cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian + +# install wallpapers +mkdir -p "${destination}"/usr/share/backgrounds/armbian-lightdm/ +cp "${SRC}"/packages/blobs/desktop/lightdm-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian-lightdm # install logo for login screen cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian - -# install wallpapers -mkdir -p "${destination}"/usr/share/backgrounds/armbian/ -cp "${SRC}"/packages/blobs/desktop/wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian/ diff --git a/packages/blobs/desktop/desktop-wallpaper/Armbian-clear-rounded-bakcground-3840-2160.jpg b/packages/blobs/desktop/desktop-wallpapers/Armbian-clear-rounded-bakcground-3840-2160.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/Armbian-clear-rounded-bakcground-3840-2160.jpg rename to packages/blobs/desktop/desktop-wallpapers/Armbian-clear-rounded-bakcground-3840-2160.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-black-psycho.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-black-psycho.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-black-psycho.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-black-psycho.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-blue-circle.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-blue-circle.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-blue-circle.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-blue-circle.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-blue-monday.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-blue-monday.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-blue-monday.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-blue-monday.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-blue-penguin.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-blue-penguin.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-blue-penguin.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-blue-penguin.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-gray.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-gray.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-gray.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-gray.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-green-penguin.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-green-penguin.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-green-penguin.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-green-penguin.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-green-wall-penguin.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-green-wall-penguin.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-green-wall-penguin.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-green-wall-penguin.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-neglated.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-neglated.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-neglated.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-neglated.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-neon-gray-penguin.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-neon-gray-penguin.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-neon-gray-penguin.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-neon-gray-penguin.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-plastic-love.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-plastic-love.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-plastic-love.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-plastic-love.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-purple-penguin.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-purple-penguin.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-purple-penguin.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-purple-penguin.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-purplepunk.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-purplepunk.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-purplepunk.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-purplepunk.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-red-penguin-dark.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-red-penguin-dark.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-red-penguin-dark.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-red-penguin-dark.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-red-penguin.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-red-penguin.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-red-penguin.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-red-penguin.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-4k-retro-green.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-4k-retro-green.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-4k-retro-green.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-4k-retro-green.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian-full-undeer-construction-3840-2160.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian-full-undeer-construction-3840-2160.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian-full-undeer-construction-3840-2160.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian-full-undeer-construction-3840-2160.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian03-Dre0x-Minum-dark-3840x2160.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian03-Dre0x-Minum-dark-3840x2160.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian03-Dre0x-Minum-dark-3840x2160.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian03-Dre0x-Minum-dark-3840x2160.jpg diff --git a/packages/blobs/desktop/desktop-wallpaper/armbian18-Dre0x-Minum-light-3840x2160.jpg b/packages/blobs/desktop/desktop-wallpapers/armbian18-Dre0x-Minum-light-3840x2160.jpg similarity index 100% rename from packages/blobs/desktop/desktop-wallpaper/armbian18-Dre0x-Minum-light-3840x2160.jpg rename to packages/blobs/desktop/desktop-wallpapers/armbian18-Dre0x-Minum-light-3840x2160.jpg