Ustawienie wyświetlania poprawnego logo dystrybucji.

diff --git a/install.sh b/install.sh
index b3b64806309bdb079e77afdc328f8b0ecbada7bf..711163838b6bffa4c63dc85ec471a6c16ddbe50b 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -33,6 +33,10 @@ else
        fi
        cp -rvv xfce4 /home/${USER}/.config;
   rm /home/${USER}/.config/xfce4/panel/launcher-5/16844254192.desktop;
+  if [ "$NAME" = "Ubuntu" ]; then
+    sed -i 's,button-icon=debian-logo,button-icon=ubuntu-logo,' /home/${USER}/.config/xfce4/panel/whiskermenu-1.rc;
+  fi
+
        cp -vv mimeapps.list /home/${USER}/.config;
        
        if [ ! -d /home/${USER}/.config/autostart ]; then
@@ -42,8 +46,14 @@ else
 
        cp vimrc /home/${USER}/.vimrc;
        cp conkyrc /home/${USER}/.conkyrc;
+
        if [ -f /home/${USER}/.face ]; then rm /home/${USER}/.face; fi
-       ln -s  /usr/share/icons/vendor/256x256/emblems/emblem-vendor.png /home/${USER}/.face;
+  if [ "$NAME" = "Ubuntu" ]; then
+    ln -s /usr/share/icons/LoginIcons/apps/64/computer.svg /home/${USER}/.face;
+    ln -s /home/${USER}/.face /home/${USER}/.face.icon;
+  elif [ "$NAME" = "Debian" ]; then
+         ln -s  /usr/share/icons/vendor/256x256/emblems/emblem-vendor.png /home/${USER}/.face;
+  fi
 
 fi
 
@@ -57,9 +67,11 @@ if [ "$1" ] && [ "$1" = "--immudex" ]; then
   sudo mv /etc/lightdm/lightdm-gtk-greeter-immudex.conf /etc/lightdm/lightdm-gtk-greeter.conf;
 else
   sudo rm /etc/lightdm/lightdm-gtk-greeter-immudex.conf
+  if [ "$NAME" = "Ubuntu" ]; then
+   sudo sed -i 's,vendor/256x256/emblems/emblem-vendor.png,LoginIcons/apps/64/computer.svg' /etc/lightdm/lightdm-gtk-greeter.conf; 
+  fi
 fi
 
-<<<<<<< HEAD
 if [ "$NAME" = "Ubuntu" ]; then
   sudo mkdir -p /usr/share/images/desktop-base;
 fi
@@ -68,9 +80,6 @@ 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