From: xf0r3m <jakubstasinski@protonmail.com>
Date: Wed, 17 Sep 2025 07:32:56 +0000 (+0200)
Subject: Próba dostsowania projektu do innych dystrybucji - Ubuntu.
X-Git-Url: https://gitweb.morketsmerke.org/?a=commitdiff_plain;h=860ab76c090d6032e219c352ecc03687d8db0c5d;p=xfcedebian.git

Próba dostsowania projektu do innych dystrybucji - Ubuntu.
---

diff --git a/install.sh b/install.sh
index cdfb2dc..b3b6480 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+source /etc/os-release;
 
 # Pakiet conky jest pakietem wirtualnym zapewnianym przez:
 #  conky-std 1.19.5-1
@@ -58,7 +59,18 @@ else
   sudo rm /etc/lightdm/lightdm-gtk-greeter-immudex.conf
 fi
 
+<<<<<<< HEAD
+if [ "$NAME" = "Ubuntu" ]; then
+  sudo mkdir -p /usr/share/images/desktop-base;
+fi
+
+if [ -f /usr/share/images/desktop-base/default ]; then
+  sudo rm /usr/share/images/desktop-base/default;
+fi
+
+=======
 sudo rm /usr/share/images/desktop-base/default;
+>>>>>>> 8e0f5c7f222ce20c8b58008456b00846cbacabb3
 sudo cp -rvv images/* /usr/share/images/desktop-base;
 sudo ln -s /usr/share/images/desktop-base/d13_wallpaper.png /usr/share/images/desktop-base/default;
 if [ -f /usr/share/backgrounds/xfce/xfce-x.svg ]; then