diff options
| author | Jonathan Bauer | 2020-01-16 13:42:39 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2020-01-16 13:42:39 +0100 |
| commit | ddf626015b3e745b8aacbfb7e5d7f74e84bfbe7c (patch) | |
| tree | 2ff929b156e4cd5fa52f150159308398345e7c23 | |
| parent | [run-virt/vbox-src] initial multi-monitor support (diff) | |
| download | mltk-ddf626015b3e745b8aacbfb7e5d7f74e84bfbe7c.tar.gz mltk-ddf626015b3e745b8aacbfb7e5d7f74e84bfbe7c.tar.xz mltk-ddf626015b3e745b8aacbfb7e5d7f74e84bfbe7c.zip | |
[kiosk-slxbrowser] support for (non-)interactive
| -rw-r--r-- | core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser b/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser index 6d844b97..9f53d0b3 100644 --- a/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser +++ b/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser @@ -5,12 +5,12 @@ command -v slxbrowser || return 0 export PATH=$PATH:/opt/openslx/sbin:/opt/openslx/bin -OPTS= +OPTS=() # Ignore SSL errors -[ -n "$SLX_BROWSER_INSECURE" ] && [ "$SLX_BROWSER_INSECURE" -gt 0 ] && OPTS="$OPTS --insecure" +[ -n "$SLX_BROWSER_INSECURE" ] && [ "$SLX_BROWSER_INSECURE" -gt 0 ] && OPTS+=("--insecure") # On inactivity, reload every X seconds -[ -n "$SLX_BROWSER_RELOAD_SECS" ] && [ "$SLX_BROWSER_RELOAD_SECS" -gt 0 ] && OPTS="$OPTS --reload-interval $SLX_BROWSER_RELOAD_SECS" +[ -n "$SLX_BROWSER_RELOAD_SECS" ] && [ "$SLX_BROWSER_RELOAD_SECS" -gt 0 ] && OPTS+=("--reload-interval" "$SLX_BROWSER_RELOAD_SECS") # If set, is a space separated list of URLs or hosts if [ -n "$SLX_BROWSER_URLLIST" ]; then # Turn into file with one entry per line @@ -18,12 +18,18 @@ if [ -n "$SLX_BROWSER_URLLIST" ]; then echo "$SLX_BROWSER_URLLIST" | sed -r 's/\s+/\n/g' > "$LIST" # Is it a whitelist or blacklist if [ -n "$SLX_BROWSER_IS_WHITELIST" ] && [ "$SLX_BROWSER_IS_WHITELIST" -gt 0 ]; then - OPTS="$OPTS --whitelist $LIST" + OPTS+=("--whitelist" "$LIST") else - OPTS="$OPTS --blacklist $LIST" + OPTS+=("--blacklist" "$LIST") fi # Async, clean up file after slxbrowser read it ( sleep 5; rm -f -- "$LIST" ) & fi -exec slxbrowser $OPTS --fullscreen "$SLX_BROWSER_URL" +if [ -n "$SLX_BROWSER_INTERACTIVE" ]; then + OPTS+=("--maximized") +else + OPTS+=("--fullscreen") +fi + +exec slxbrowser "${OPTS[@]}" "$SLX_BROWSER_URL" |