[X2Go-Commits] [live-build-x2go] 06/28: dash's echo does not understand -e, thus removed

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 02:33:05 CET 2017


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 9f875e0087e009eaa47cefa27acefeba235ad949
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Tue Nov 7 17:25:54 2017 +0100

    dash's echo does not understand -e, thus removed
---
 config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia   | 2 +-
 config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
index 438957b..78e4dd5 100755
--- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
@@ -42,7 +42,7 @@ GetSSHHostKeysFromMedia ()
 	}
 
 	for BLOCKDEV in $BLOCKDEVS; do 
-		NEXTDEVICE=$(echo -e "$X2GOTCELIVELABELS" | grep "$BLOCKDEV")
+		NEXTDEVICE=$(echo "$X2GOTCELIVELABELS" | grep "$BLOCKDEV")
 		if [ -n "$NEXTDEVICE" ] ; then
 			MNTPT=$(echo $NEXTDEVICE | awk '{print $2}')
 			NEXTDEVICE=$(echo $NEXTDEVICE | awk '{print $1}')
diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index 892892c..de07b01 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -64,7 +64,7 @@ GetSSHClientKeysFromMedia ()
 	}
 
 	for BLOCKDEV in $BLOCKDEVS; do 
-		NEXTDEVICE=$(echo -e "$X2GOTCELIVELABELS\n$PORTABLEAPPLABELS" | grep "$BLOCKDEV")
+		NEXTDEVICE=$(echo "$X2GOTCELIVELABELS\n$PORTABLEAPPLABELS" | grep "$BLOCKDEV")
 		if [ -n "$NEXTDEVICE" ] ; then
 			MNTPT=$(echo $NEXTDEVICE | awk '{print $2}')
 			NEXTDEVICE=$(echo $NEXTDEVICE | awk '{print $1}')

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