From c08530d26abb89d84757bcac5de85dd78319faf6 Mon Sep 17 00:00:00 2001
From: TomasM <tomas@slax.org>
Date: Sat, 24 Mar 2018 17:53:10 -0400
Subject: [PATCH] Include chromium stub in desktop module

---
 Slax/debian/modules/03-desktop/build                |   2 ++
 .../home/guest/.config/chromium/Default/Preferences |   0
 .../rootcopy/home/guest/.config/chromium/First Run  |   0
 .../modules/03-desktop/rootcopy/usr/bin/fbliveapp   |   5 ++---
 .../usr/share/applications/chromium.desktop         |   0
 .../share/icons/hicolor/128x128/apps/chromium.png   | Bin
 Slax/debian/modules/05-chromium/build               |   5 -----
 7 files changed, 4 insertions(+), 8 deletions(-)
 rename Slax/debian/modules/{05-chromium => 03-desktop}/rootcopy/home/guest/.config/chromium/Default/Preferences (100%)
 rename Slax/debian/modules/{05-chromium => 03-desktop}/rootcopy/home/guest/.config/chromium/First Run (100%)
 rename Slax/debian/modules/{05-chromium => 03-desktop}/rootcopy/usr/share/applications/chromium.desktop (100%)
 rename Slax/debian/modules/{05-chromium => 03-desktop}/rootcopy/usr/share/icons/hicolor/128x128/apps/chromium.png (100%)

diff --git a/Slax/debian/modules/03-desktop/build b/Slax/debian/modules/03-desktop/build
index d2862a8..9ecb5b8 100755
--- a/Slax/debian/modules/03-desktop/build
+++ b/Slax/debian/modules/03-desktop/build
@@ -20,7 +20,9 @@ apt-get install --no-install-recommends --yes \
 . ../../cleanup
 
 (cd rootcopy && cp --parents -afr * /)
+chown guest.users /home/guest
 chown -R guest.users /home/guest/.gtkrc-2.0
+chown -R guest.users /home/guest/.config
 
 savechanges /$NAME-stock.sb
 
diff --git a/Slax/debian/modules/05-chromium/rootcopy/home/guest/.config/chromium/Default/Preferences b/Slax/debian/modules/03-desktop/rootcopy/home/guest/.config/chromium/Default/Preferences
similarity index 100%
rename from Slax/debian/modules/05-chromium/rootcopy/home/guest/.config/chromium/Default/Preferences
rename to Slax/debian/modules/03-desktop/rootcopy/home/guest/.config/chromium/Default/Preferences
diff --git a/Slax/debian/modules/05-chromium/rootcopy/home/guest/.config/chromium/First Run b/Slax/debian/modules/03-desktop/rootcopy/home/guest/.config/chromium/First Run
similarity index 100%
rename from Slax/debian/modules/05-chromium/rootcopy/home/guest/.config/chromium/First Run
rename to Slax/debian/modules/03-desktop/rootcopy/home/guest/.config/chromium/First Run
diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbliveapp b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbliveapp
index 87246a0..009e707 100755
--- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbliveapp
+++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbliveapp
@@ -65,10 +65,9 @@ if [ -f "$EXECUTABLE" ]; then
 
    if [ "$GUEST" = "true" -a "$EUID" -eq 0 ]; then
       xhost + >/dev/null 2>/dev/null
-      su -c "$EXECUTABLE "$@""  guest
-      exit 0
+      exec su -c "$EXECUTABLE "$@""  guest
    fi
 
-   "$EXECUTABLE" "$@"
+   exec "$EXECUTABLE" "$@"
 
 fi
diff --git a/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop b/Slax/debian/modules/03-desktop/rootcopy/usr/share/applications/chromium.desktop
similarity index 100%
rename from Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop
rename to Slax/debian/modules/03-desktop/rootcopy/usr/share/applications/chromium.desktop
diff --git a/Slax/debian/modules/05-chromium/rootcopy/usr/share/icons/hicolor/128x128/apps/chromium.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/hicolor/128x128/apps/chromium.png
similarity index 100%
rename from Slax/debian/modules/05-chromium/rootcopy/usr/share/icons/hicolor/128x128/apps/chromium.png
rename to Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/hicolor/128x128/apps/chromium.png
diff --git a/Slax/debian/modules/05-chromium/build b/Slax/debian/modules/05-chromium/build
index 201ba96..6ffe5cb 100755
--- a/Slax/debian/modules/05-chromium/build
+++ b/Slax/debian/modules/05-chromium/build
@@ -6,11 +6,6 @@ apt-get install --yes --no-install-recommends chromium
 . ../../cleanup
 
 rm -Rf /usr/share/icons/gnome/256x256
-
-(cd rootcopy && cp --parents -afr * /)
-chown guest.users /home/guest
-chown -R guest.users /home/guest/.config
-
 rm -Rf /squashfs-root/root/.fluxbox
 rm -f /squashfs-root/root/.gtk-bookmarks