[X2Go-Commits] [live-build-x2go] 20/35: fixed various syntax errors stemming from perl->bash conversion

[git-admin at x2go.org]

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 3cc219882a6a0f541b2a010db251fa2a510c273d
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Thu Dec 22 01:08:30 2016 +0100

    fixed various syntax errors stemming from perl->bash conversion
---
 .../lib/live/config/2800-x2go-thinclientconfig       | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index 96557d2..32b9519 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -96,10 +96,10 @@ pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detec
 >>>>>>> f17b900... moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now
 
 # additional variable instead of "case $(...) in", as we need the value again later on
-XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\\\$1 == "xinerama" { print \\\$2 }')
+XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '$''1 == "xinerama" { print $''2 }')
 
 # sanitize input
-case $XRANDRCMDTAINTED in
+case \$XRANDRCMDTAINTED in
 "above")
 	XRANDRCMD="above"
 	;;
@@ -118,10 +118,10 @@ case $XRANDRCMDTAINTED in
 esac
 
 # find out how many touch devices we have
-TOUCHDEVICESCOUNT = \$(LANG=C xsetwacom --list devices | wc -l)
+TOUCHDEVICESCOUNT=\$(LANG=C xsetwacom --list devices | wc -l)
 
 # find out how many mouse devices we have
-MICECOUNT = \$(find /dev/input -maxdepth 1 -name "mouse*" | wc -l)
+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
@@ -141,18 +141,15 @@ for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d '
 		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
+			/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
+		THIS_DISPLAY=\$NEXT_DISPLAY
 	fi
 done
 
-# set screen background to X2Go default blue on all detected screens
-xsetroot -solid "#246ed8"
-
 # Spawn openbox
 openbox &
 
@@ -160,10 +157,15 @@ openbox &
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 # set screen background to X2Go default blue on all detected screens
 xsetroot -solid "#246ed8"
 =======
 >>>>>>> f495c9f... added support for passing of LDAP parameters
+=======
+# set screen background to X2Go default blue on all detected screens
+xsetroot -solid "#246ed8"
+>>>>>>> 8338fe6... fixed various syntax errors stemming from perl->bash conversion
 
 # Get X2GoConfig
 BROKERURL=\$(cat /proc/cmdline | \

--
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