diff --git a/Slax/debian/cleanup b/Slax/debian/cleanup index 20f7c52..f05a833 100644 --- a/Slax/debian/cleanup +++ b/Slax/debian/cleanup @@ -48,7 +48,6 @@ rm -Rf /usr/share/icons/gnome/256x256 rm /usr/share/applications/compton.desktop rm /usr/share/applications/debian-uxterm.desktop rm /usr/share/applications/debian-xterm.desktop -rm /usr/share/applications/feh.desktop rm /usr/share/applications/htop.desktop rm /usr/share/applications/mc.desktop rm /usr/share/applications/mcedit.desktop diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbliveapp b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbliveapp index 93f933e..87246a0 100755 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbliveapp +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbliveapp @@ -26,6 +26,14 @@ qt-privacy-ask=0' > /home/guest/.config/vlc/vlcrc;" GUEST=true fi +if [ "$1" = "chromium" ]; then + NAME="Chromium Web Browser" + EXECUTABLE="/usr/bin/chromium" + INSTALL="apt install --yes chromium" + GUEST=true +fi + +shift # ------------------------------------------------ # do not touch anything below this line @@ -52,15 +60,15 @@ fi if [ -f "$EXECUTABLE" ]; then - if [ "$GUEST" = "true" ]; then + + fbstartupnotify + + if [ "$GUEST" = "true" -a "$EUID" -eq 0 ]; then xhost + >/dev/null 2>/dev/null - if [ "$EUID" -ne 0 ]; then - "$EXECUTABLE" - exit 0 - fi - su -c "$EXECUTABLE" guest + su -c "$EXECUTABLE "$@"" guest exit 0 fi - "$EXECUTABLE" + "$EXECUTABLE" "$@" + fi diff --git a/Slax/debian/modules/05-chromium/build b/Slax/debian/modules/05-chromium/build index e7f3084..201ba96 100755 --- a/Slax/debian/modules/05-chromium/build +++ b/Slax/debian/modules/05-chromium/build @@ -7,8 +7,6 @@ apt-get install --yes --no-install-recommends chromium rm -Rf /usr/share/icons/gnome/256x256 -mv /usr/bin/chromium /usr/bin/chromium-launcher - (cd rootcopy && cp --parents -afr * /) chown guest.users /home/guest chown -R guest.users /home/guest/.config diff --git a/Slax/debian/modules/05-chromium/rootcopy/bin/chromium b/Slax/debian/modules/05-chromium/rootcopy/bin/chromium deleted file mode 100755 index 46234c3..0000000 --- a/Slax/debian/modules/05-chromium/rootcopy/bin/chromium +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -xhost + >/dev/null 2>/dev/null -if [ "$EUID" -ne 0 ]; then - chromium-launcher "$@" - exit 0 -fi -su -c "chromium-launcher "$@"" guest diff --git a/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop b/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop index d3a8f44..bcc3636 100644 --- a/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop +++ b/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop @@ -2,7 +2,7 @@ Version=1.0 Name=Web Browser GenericName=Web Browser -Exec=chromium %U +Exec=fbliveapp chromium %U Terminal=false X-MultipleArgs=false Type=Application