diff options
| -rwxr-xr-x | internet-kiosk/bin/internet-kiosk-browser | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/internet-kiosk/bin/internet-kiosk-browser b/internet-kiosk/bin/internet-kiosk-browser index a213cbc..5e260f1 100755 --- a/internet-kiosk/bin/internet-kiosk-browser +++ b/internet-kiosk/bin/internet-kiosk-browser @@ -35,7 +35,7 @@ HIDE_IDLE_POINTER="yes" # There can be master terminals and slave terminals. # All terminal not listed here are slave terminals... -MASTER_TERMINALS="($hostname -f)" +MASTER_TERMINALS="$(hostname -f)" # these terminals can have different startup URLs START_URL_MASTERS="http://wiki.debian.org" @@ -77,7 +77,7 @@ if ! pacmd stat 1>/dev/null 2>/dev/null; then fi # launch matchbox manager -if wmctrl -m 2>/dev/null; then +if ! wmctrl -m 2>/dev/null; then if which matchbox-window-manager 1>/dev/null; then matchbox-window-manager & fi @@ -94,14 +94,14 @@ START_URL="$START_URL_SLAVES" RESOLUTION="$SLAVE_RESOLUTION" for master_terminal in $MASTER_TERMINALS; do - if [ $(hostname -f) == "$master_terminal" ]; then + if [ "x$(hostname -f)" = "x$master_terminal" ]; then START_URL="$START_URL_MASTERS" RESOLUTION="$MASTER_RESOLUTION" break fi done -if [ -n ${RESOLUTION} ]; then +if [ -n "${RESOLUTION}" ]; then if which xrandr 1>/dev/null; then xrandr -d :0 --output default --mode ${RESOLUTION} fi @@ -109,14 +109,12 @@ fi # Set screensaver settings if which xset 1>/dev/null; then - xset s "${SCREENSAVER_SETTINGS}" + xset s ${SCREENSAVER_SETTINGS} fi # launch the web browser... if which firefox 1>/dev/null; then firefox $START_URL -elif which iceweasel 1>/dev/null; then - iceweasel $START_URL fi exit 0 |