[X2Go-Commits] [live-build-x2go] 37/38: unretab 2800-x2go-thinclientconfig
git-admin at x2go.org
git-admin at x2go.org
Fri Apr 28 11:56:51 CEST 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/fvwm
in repository live-build-x2go.
commit 65f54bbe54559d916e6484a043be15382bcdbed0
Author: Juri Grabowski <gratuxri at gmail.com>
Date: Fri Apr 28 11:48:14 2017 +0200
unretab 2800-x2go-thinclientconfig
---
.../lib/live/config/2800-x2go-thinclientconfig | 128 ++++++++++-----------
1 file changed, 64 insertions(+), 64 deletions(-)
diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index 0aca654..6ccf009 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -30,20 +30,20 @@ XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "xinera
# sanitize input
case \$XRANDRCMDTAINTED in
"above")
- XRANDRCMD="above"
- ;;
+ XRANDRCMD="above"
+ ;;
"below")
- XRANDRCMD="below"
- ;;
+ XRANDRCMD="below"
+ ;;
"same-as")
- XRANDRCMD="same-as"
- ;;
+ XRANDRCMD="same-as"
+ ;;
"right-of")
- XRANDRCMD="right-of"
- ;;
+ XRANDRCMD="right-of"
+ ;;
*)
- XRANDRCMD="left-of" # default
- ;;
+ XRANDRCMD="left-of" # default
+ ;;
esac
# find out how many touch devices we have
@@ -55,28 +55,28 @@ MICECOUNT=\$(find /dev/input -maxdepth 1 -name "mouse*" | wc -l)
# loop through the following code block for all connected display devices
for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' ' -f1); do
- #remove trailing newline from NEXT_DISPLAY
- NEXT_DISPLAY=\${NEXT_DISPLAY%\$'\n'}
+ #remove trailing newline from NEXT_DISPLAY
+ NEXT_DISPLAY=\${NEXT_DISPLAY%\$'\n'}
- # THIS_DISPLAY won't be defined until the second time the loop is executed, which is a
- # neat way of running xrandr only if there are at least two connected display devices
- if [ -n "\${THIS_DISPLAY+x}" ] ; then
+ # THIS_DISPLAY won't be defined until the second time the loop is executed, which is a
+ # neat way of running xrandr only if there are at least two connected display devices
+ if [ -n "\${THIS_DISPLAY+x}" ] ; then
- if [ \$TOUCHDEVICESCOUNT -gt 0 ] && [ \$MICECOUNT -lt 1 ] && [ -z \$XRANDRCMDTAINTED ]; then
- # we have a touch device and no mice, and no xinerama parameter was set,
- # so switch to clone view to make the touch device usable
- /usr/bin/xrandr --output \$NEXT_DISPLAY --same-as \$THIS_DISPLAY
+ if [ \$TOUCHDEVICESCOUNT -gt 0 ] && [ \$MICECOUNT -lt 1 ] && [ -z \$XRANDRCMDTAINTED ]; then
+ # we have a touch device and no mice, and no xinerama parameter was set,
+ # so switch to clone view to make the touch device usable
+ /usr/bin/xrandr --output \$NEXT_DISPLAY --same-as \$THIS_DISPLAY
- else
- # else use whatever is in XRANDRCMD (which is either our default of "left-of",
- # or a valid xinerama kernel parameter value)
- /usr/bin/xrandr --output \$NEXT_DISPLAY --\$XRANDRCMD \$THIS_DISPLAY
- fi
+ else
+ # else use whatever is in XRANDRCMD (which is either our default of "left-of",
+ # or a valid xinerama kernel parameter value)
+ /usr/bin/xrandr --output \$NEXT_DISPLAY --\$XRANDRCMD \$THIS_DISPLAY
+ fi
- # now set THIS_DISPLAY -> every subsequent iteration of the loop will now enter the code block
- # above where [ -n \${THIS_DISPLAY+x} ] is the conditional
- THIS_DISPLAY=\$NEXT_DISPLAY
- fi
+ # now set THIS_DISPLAY -> every subsequent iteration of the loop will now enter the code block
+ # above where [ -n \${THIS_DISPLAY+x} ] is the conditional
+ THIS_DISPLAY=\$NEXT_DISPLAY
+ fi
done
# Spawn openbox
@@ -87,56 +87,56 @@ xsetroot -solid "#246ed8"
# Get X2GoConfig
BROKERURL=\$(cat /proc/cmdline | \
- tr ' ' '\n' | \
- awk -F'=' ' /^broker-url=/ { print \$2 }')
+ tr ' ' '\n' | \
+ awk -F'=' ' /^broker-url=/ { print \$2 }')
LDAP=\$(cat /proc/cmdline | \
- tr ' ' '\n' | \
- sed 's/^ldap=/ldap#/' | \
- awk -F'#' ' /^ldap#/ { print \$2 }')
+ tr ' ' '\n' | \
+ sed 's/^ldap=/ldap#/' | \
+ awk -F'#' ' /^ldap#/ { print \$2 }')
LDAP1=\$(cat /proc/cmdline | \
- tr ' ' '\n' | \
- sed 's/^ldap1=/ldap1#/' | \
- awk -F'#' ' /^ldap1#/ { print \$2 }')
+ tr ' ' '\n' | \
+ sed 's/^ldap1=/ldap1#/' | \
+ awk -F'#' ' /^ldap1#/ { print \$2 }')
LDAP2=\$(cat /proc/cmdline | \
- tr ' ' '\n' | \
- sed 's/^ldap2=/ldap2#/' | \
- awk -F'#' ' /^ldap2#/ { print \$2 }')
+ tr ' ' '\n' | \
+ sed 's/^ldap2=/ldap2#/' | \
+ awk -F'#' ' /^ldap2#/ { print \$2 }')
# Spawn X2GoClient
if [ -n "\$BROKERURL" ]; then
- SESSIONFROM="--broker-url=\$BROKERURL"
+ SESSIONFROM="--broker-url=\$BROKERURL"
else
- SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions"
+ SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions"
fi
if [ -n "\$LDAP" ] ; then
- if [ -n "\$LDAP1" ] ; then
- BACKUPLDAP="--ldap1=\$LDAP1"
- if [ -n "\$LDAP2" ] ; then
- BACKUPLDAP="\$BACKUPLDAP --ldap2=\$LDAP2"
- fi
- fi
- LDAPPARAMS="--ldap=\$LDAP \$BACKUPLDAP"
+ if [ -n "\$LDAP1" ] ; then
+ BACKUPLDAP="--ldap1=\$LDAP1"
+ if [ -n "\$LDAP2" ] ; then
+ BACKUPLDAP="\$BACKUPLDAP --ldap2=\$LDAP2"
+ fi
+ fi
+ LDAPPARAMS="--ldap=\$LDAP \$BACKUPLDAP"
else
- LDAPPARAMS=""
+ LDAPPARAMS=""
fi
BLANKINGTIME=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "blank" { print \$2 }')
if [ -n "\$BLANKINGTIME" ]; then
- DPMSARR=(\$(echo \$BLANKINGTIME | awk -F ':' '\$1 ~/^[0-9]*\$/ && \$2 ~/^[0-9]*\$/ && \$3 ~/^[0-9]*\$/ { print \$1 " " \$2 " " \$3}'))
- if [ \${DPMSARR[0]} -eq 0 ]; then
- # Disable screensaver and DPMS Power Saving if requested
- xset s off
- if ! grep -q '\W*nodpms\W*' /proc/cmdline; then
- xset -dpms
- fi
- else
- xset s on
- xset s \${DPMSARR[0]}
- if ! grep -q '\W*nodpms\W*' /proc/cmdline; then
- # Yes, "+dpms dpms" is intentional.
- xset +dpms dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]}
- fi
- fi
+ DPMSARR=(\$(echo \$BLANKINGTIME | awk -F ':' '\$1 ~/^[0-9]*\$/ && \$2 ~/^[0-9]*\$/ && \$3 ~/^[0-9]*\$/ { print \$1 " " \$2 " " \$3}'))
+ if [ \${DPMSARR[0]} -eq 0 ]; then
+ # Disable screensaver and DPMS Power Saving if requested
+ xset s off
+ if ! grep -q '\W*nodpms\W*' /proc/cmdline; then
+ xset -dpms
+ fi
+ else
+ xset s on
+ xset s \${DPMSARR[0]}
+ if ! grep -q '\W*nodpms\W*' /proc/cmdline; then
+ # Yes, "+dpms dpms" is intentional.
+ xset +dpms dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]}
+ fi
+ fi
fi
x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM
--
Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
More information about the x2go-commits
mailing list