summaryrefslogtreecommitdiffstats
path: root/core/modules/kiosk-chromium
diff options
context:
space:
mode:
authorSimon Rettberg2019-11-12 14:43:08 +0100
committerSimon Rettberg2019-11-12 14:43:08 +0100
commite788c553ce17596d88cc3c16680adcfe4d763c57 (patch)
tree5f2c1576948989edf36321540df72326bd149faa /core/modules/kiosk-chromium
parent[vmware15] garantee single accept(OVF)?EULA lines (diff)
downloadmltk-e788c553ce17596d88cc3c16680adcfe4d763c57.tar.gz
mltk-e788c553ce17596d88cc3c16680adcfe4d763c57.tar.xz
mltk-e788c553ce17596d88cc3c16680adcfe4d763c57.zip
[kiosk-*] Support SLX_BROWSER, add precheck for browser binary
SLX_BROWSER is is space separated list of keywords. They are globbed within the kiosk-launch.d directory, so specifying SLX_BROWSER='chromium firefox' would first look for any file named *chromium* and source it, and if that fails for any file named *firefox*. If everything fails or the variable is empty, any file in that directory will be sourced.
Diffstat (limited to 'core/modules/kiosk-chromium')
-rw-r--r--core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
index 90064cf9..caf67ab9 100644
--- a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
+++ b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/bash -- sourced
# prepares and run chromium as kiosk browser
-. /opt/openslx/config
+command -v chromium-browser || return 0
# clear state of previous sessions
[ -e "$HOME/.config/chromium" ] && rm -rf -- "$HOME/.config/chromium"