[X2Go-Commits] [live-build-x2go] 16/18: (hopefully) fixed issue that parameters without an equals sign became appended to the preceding parameter's value (not fixed in 2900* yet, as those differ across branches)

git-admin at x2go.org git-admin at x2go.org
Wed Jan 24 18:08:47 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/mate-minidesktop
in repository live-build-x2go.

commit f7c6279d7a260e8b9331d91bed9eed46c9249006
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Mon Dec 11 15:13:01 2017 +0100

    (hopefully) fixed issue that parameters without an equals sign became appended to the preceding parameter's value (not fixed in 2900* yet, as those differ across branches)
---
 config/includes.chroot/lib/live/config/2100-show-sysconf     |  2 +-
 .../lib/live/config/2250-getsshpubkeysfromserver             |  2 +-
 .../lib/live/config/2300-xserver-xorg-getxorgconf            |  2 +-
 config/includes.chroot/lib/live/config/2400-live-autoupdate  | 12 ++++++------
 config/includes.chroot/lib/live/config/2600-tcpprint         |  2 +-
 config/includes.chroot/lib/live/config/2700-x2go-getsessions |  2 +-
 config/includes.chroot/lib/live/config/2710-x2go-getbranding |  2 +-
 config/includes.chroot/lib/live/config/2720-x2go-getbg       |  2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2100-show-sysconf b/config/includes.chroot/lib/live/config/2100-show-sysconf
index f703a6c..70c6625 100755
--- a/config/includes.chroot/lib/live/config/2100-show-sysconf
+++ b/config/includes.chroot/lib/live/config/2100-show-sysconf
@@ -20,7 +20,7 @@ fi
 
 (
 	if grep -q findiso /proc/cmdline ; then
-		BOOTEDENV=\$(basename \$(dirname \$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | awk -F'=' ' \$1 == "findiso" { print \$2 }')) | tr -dc 'a-zA-Z0-9. _\-')
+		BOOTEDENV=\$(basename \$(dirname \$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F'=' ' \$1 == "findiso" { print \$2 }')) | tr -dc 'a-zA-Z0-9. _\-')
 	fi
 	for TIMESTAMPFILE in /lib/live/mount/rootfs/*/lib; do
 		TIMESTAMP=\$(stat -c %Y \$TIMESTAMPFILE)
diff --git a/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
index 473fe01..0326ee5 100755
--- a/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
+++ b/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
@@ -8,7 +8,7 @@ GetSSHPubKeysFromServer ()
 	echo -n " getsshpubkeysfromserver"
 
 
-	PUBKEYURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+	PUBKEYURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
 		    awk -F'=' ' /^pubkey=/ { print $2 }' |\
 		    tr -dc 'a-zA-Z0-9.:/?%_\-')
 
diff --git a/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf b/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf
index 9390e9e..60b4b56 100755
--- a/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf
+++ b/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf
@@ -6,7 +6,7 @@ XServerXorgGetXorgConf ()
 #
 echo -n " xserver-xorg-getxorgconf"
 
-        XORGCONFURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+        XORGCONFURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
                       awk -F'=' ' /^xorgconfurl=/ { print $2 }' | \
 		      tr -dc 'a-zA-Z0-9.:/?%_\-')
         if [ -n "$XORGCONFURL" ] && [ -d /etc/X11 ] ; then 
diff --git a/config/includes.chroot/lib/live/config/2400-live-autoupdate b/config/includes.chroot/lib/live/config/2400-live-autoupdate
index 919cb44..03ef11e 100755
--- a/config/includes.chroot/lib/live/config/2400-live-autoupdate
+++ b/config/includes.chroot/lib/live/config/2400-live-autoupdate
@@ -119,7 +119,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 	unset LC_MESSAGES
 
 	# Define our mountpoint and check if we're capable of auto-updating
-	NTFSROOT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | awk -F '=' '/^ntfs-uuid/ { print $2 }' |  tr -dc 'a-zA-Z0-9_\-')
+	NTFSROOT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '/^ntfs-uuid/ { print $2 }' |  tr -dc 'a-zA-Z0-9_\-')
 	if [ -n "$NTFSROOT" ]; then
 		mkdir -p /lib/live/mount/ntfsroot
 		# This is in case we've been passed an incomplete UUID and/or one with dashes
@@ -162,7 +162,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 	fi
 
 	# determine our booted environment as well as the other available ones
-	RUNNINGSYSTEMFULLPATH=$(dirname $(readlink -m "$MOUNTPOINT/$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+	RUNNINGSYSTEMFULLPATH=$(dirname $(readlink -m "$MOUNTPOINT/$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
 				awk -F'=' ' /^findiso=/ { print $2 }' | \
 				tr -dc 'a-zA-Z0-9./ _\-')"))
 
@@ -170,7 +170,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 	RUNNINGSYSTEMNAME=$(basename $RUNNINGSYSTEMFULLPATH)
 
 	# download url pointing to directory with all required files goes here
-	DOWNLOADURL=$( sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+	DOWNLOADURL=$( sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
 		       awk -F'=' ' /^updateurl=/ { print $2 }' | \
 		       tr -dc 'a-zA-Z0-9.:/?%_\-')
 
@@ -183,7 +183,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 		echo -n "\n$(date +'%F | %T | ')'$0': '/lib/live/mount/findiso' directory not found. Scanning for partitions."
 		LISTOFPARTITIONS=$(grep -H ^0$ /sys/block/*/removable | awk -F '/' '{ print $4 }' | xargs -n 1 -I XXX fdisk -l /dev/XXX 2>/dev/null | awk '$0 ~ /Linux$/ { print $1}')
 		TEMPMOUNT=$(mktemp -d -p /lib/live/mount/)
-		FINDFILE=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | awk -F '=' '$1 == "findiso" { print $2 }' | tr -dc 'a-zA-Z0-9./ _\-')
+		FINDFILE=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '$1 == "findiso" { print $2 }' | tr -dc 'a-zA-Z0-9./ _\-')
 		[ -z "$FINDFILE" ] && exit 0
 		for PARTITION in $LISTOFPARTITIONS ; do
 			mount -oro $PARTITION $TEMPMOUNT
@@ -213,7 +213,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 	# Bandwidth limit goes here
 	#
 	#BWLIMITPERCENT=20 # in percent, numeric-only
-	BWLIMITPERCENT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+	BWLIMITPERCENT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
 			 awk -F'=' ' /^bwlimit=/ { print $2 }' | \
 			 tr -dc '0-9')
 	if [ -z "$BWLIMITPERCENT" ]; then 
@@ -224,7 +224,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 
 	# sleeping a random amount of time to ease load on the update server
 	#
-	MAXSLEEPTIME=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+	MAXSLEEPTIME=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
 		       awk -F'=' ' /^updatesleep=/ && $2 ~ /^[0-9]*$/ { print $2 }' | \
 		       tr -dc '0-9')
 	if [ -z "$MAXSLEEPTIME" ] || [ $MAXSLEEPTIME -lt 240 ] ; then
diff --git a/config/includes.chroot/lib/live/config/2600-tcpprint b/config/includes.chroot/lib/live/config/2600-tcpprint
index 600008a..c9266ac 100755
--- a/config/includes.chroot/lib/live/config/2600-tcpprint
+++ b/config/includes.chroot/lib/live/config/2600-tcpprint
@@ -9,7 +9,7 @@ echo -n " tcpprint"
 
 if grep -q "\W*tcpprint\W*" /proc/cmdline ; then
 
-        TCPPRINTONLYFROM=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+        TCPPRINTONLYFROM=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
                            awk -F'=' ' /^tcpprintonlyfrom=/ { print $2 }' | \
 		           tr -dc 'a-zA-Z0-9.\-')
 	if [ -n "$TCPPRINTONLYFROM" ] ; then
diff --git a/config/includes.chroot/lib/live/config/2700-x2go-getsessions b/config/includes.chroot/lib/live/config/2700-x2go-getsessions
index 9af7813..d668cff 100755
--- a/config/includes.chroot/lib/live/config/2700-x2go-getsessions
+++ b/config/includes.chroot/lib/live/config/2700-x2go-getsessions
@@ -6,7 +6,7 @@ X2GoGetSessions ()
 	#
 	echo -n " x2go-getsessions"
 
-	SESSIONSURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+	SESSIONSURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
 		      awk -F'=' ' /^sessionsurl=/ { print $2 }' | \
 		      tr -dc 'a-zA-Z0-9.:/?%_\-')
 	if [ -n "$SESSIONSURL" ] && [ -d /etc/x2go ] ; then 
diff --git a/config/includes.chroot/lib/live/config/2710-x2go-getbranding b/config/includes.chroot/lib/live/config/2710-x2go-getbranding
index 71bdfaa..6147dd6 100755
--- a/config/includes.chroot/lib/live/config/2710-x2go-getbranding
+++ b/config/includes.chroot/lib/live/config/2710-x2go-getbranding
@@ -7,7 +7,7 @@ X2GoGetBranding ()
 	echo -n " x2go-getbranding"
 
 
-	BRANDINGURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+	BRANDINGURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
 		      awk -F'=' ' /^branding=/ { print $2 }' | \
 		      tr -dc 'a-zA-Z0-9.:/?%_\-')
 	BRANDINGDESTINATION=/etc/x2go/branding.svg
diff --git a/config/includes.chroot/lib/live/config/2720-x2go-getbg b/config/includes.chroot/lib/live/config/2720-x2go-getbg
index b211f85..67a5660 100755
--- a/config/includes.chroot/lib/live/config/2720-x2go-getbg
+++ b/config/includes.chroot/lib/live/config/2720-x2go-getbg
@@ -7,7 +7,7 @@ X2GoGetBG ()
 	echo -n " x2go-getbg"
 
 
-	BGURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \
+	BGURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \
 		awk -F'=' ' /^bg=/ { print $2 }' | \
 		tr -dc 'a-zA-Z0-9.:/?%_\-')
 	BGDESTINATION=/etc/x2go/bg.svg

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git


More information about the x2go-commits mailing list