This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/openbox-magic-pixel-workaround
in repository live-build-x2go.
commit f1b5ac470bd4fac2971f9997783ea6faaa1ed38b
Author: Stefan Baur <kont...@baur-itcs.de>
Date: Mon Dec 11 15:28:16 2017 +0100
(hopefully) fixed issue that parameters without an equals sign became
appended to the preceding parameter's value
---
.../lib/live/config/2900-x2go-thinclientconfig | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 61e3d60..0a549a7 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -38,7 +38,7 @@ cat >/home/user/.xsession <<XSESSION
pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L
'module-udev-detect' --exit-idle-time=65535 &
# additional variable instead of "case \$(...) in", as we need the value again
later on
-XRANDRCMDTAINTED=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\)
/\1\n/g' /proc/cmdline | awk -F '=' '\$1 == "xinerama" { print \$2 }')
+XRANDRCMDTAINTED=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\)
/\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 ==
"xinerama" { print \$2 }')
# sanitize input
case \$XRANDRCMDTAINTED in
@@ -100,21 +100,21 @@ echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox."
| tee -a /dev/tty8
xsetroot -solid "#246ed8"
# Get X2GoConfig
-BROKERURL=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g'
/proc/cmdline | \
+BROKERURL=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e
's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
awk -F'=' ' /^broker-url=/ { print \$2 }' | \
tr -dc 'a-zA-Z0-9.:/?%_\-@')
-SESSIONSELECT=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\)
/\1\n/g' /proc/cmdline | \
+SESSIONSELECT=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\)
/\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
awk -F'=' ' /^session=/ { print \$2 }' | \
tr -dc 'a-zA-Z0-9.:/ _\-@')
-LDAP=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g'
/proc/cmdline | \
+LDAP=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/
\([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
sed 's/^ldap=/ldap#/' | \
awk -F'#' ' /^ldap#/ { print \$2 }' | \
tr -dc 'a-zA-Z0-9.:_\-@')
-LDAP1=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g'
/proc/cmdline | \
+LDAP1=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/
\([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
sed 's/^ldap1=/ldap1#/' | \
awk -F'#' ' /^ldap1#/ { print \$2 }' | \
tr -dc 'a-zA-Z0-9.:_\-@')
-LDAP2=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g'
/proc/cmdline | \
+LDAP2=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/
\([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
sed 's/^ldap2=/ldap2#/' | \
awk -F'#' ' /^ldap2#/ { print \$2 }' | \
tr -dc 'a-zA-Z0-9.:_\-@')
@@ -175,7 +175,7 @@ else
LDAPPARAMS=""
fi
-BLANKINGTIME=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g'
/proc/cmdline | awk -F '=' '\$1 == "blank" { print \$2 }' | tr -dc '0-9:')
+BLANKINGTIME=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g'
-e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 == "blank" {
print \$2 }' | tr -dc '0-9:')
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
@@ -195,7 +195,7 @@ if [ -n "\$BLANKINGTIME" ]; then
fi
THROTTLINGCOMMAND=""
-THROTTLEVALUES=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\)
/\1\n/g' /proc/cmdline | awk -F '=' '\$1 == "throttle" { print \$2 }' | tr -dc
'0-9.:u')
+THROTTLEVALUES=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\)
/\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 ==
"throttle" { print \$2 }' | tr -dc '0-9.:u')
if [ -n "\$THROTTLEVALUES" ]; then
# determine maximum line speed
# look for all interfaces in state "up", then read their speed value
from the file named speed
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/live-build-x2go.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
