From polynomial-c@gentoo.org Fri Nov 7 17:00:13 2014 Received: (at submit) by bugs.x2go.org; 7 Nov 2014 16:00:15 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.3.2 X-Greylist: delayed 494 seconds by postgrey-1.34 at ymir.das-netzwerkteam.de; Fri, 07 Nov 2014 17:00:12 CET Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id D28F05DEA7 for ; Fri, 7 Nov 2014 17:00:12 +0100 (CET) Received: from shanghai.paradoxon.rec (p4FDAB157.dip0.t-ipconnect.de [79.218.177.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: polynomial-c) by smtp.gentoo.org (Postfix) with ESMTPSA id 85BCA340467 for ; Fri, 7 Nov 2014 15:51:54 +0000 (UTC) Date: Fri, 7 Nov 2014 16:51:42 +0100 From: Lars Wendler To: submit@bugs.x2go.org Subject: [Patch] Replace "echo -n" with printf Message-ID: <20141107165142.7acf1f19@shanghai.paradoxon.rec> Organization: Gentoo X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/8PXTaHs71KyHfkZP6R6FisC"; protocol="application/pgp-signature" --Sig_/8PXTaHs71KyHfkZP6R6FisC Content-Type: multipart/mixed; boundary="MP_/HbMLPWFZZwUWKGe23/BJxNU" --MP_/HbMLPWFZZwUWKGe23/BJxNU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Package: x2goclient Version: git master Hi, at Gentoo latest version of the dash shell doesn't support "echo -n" anymore[1]. The result is that x2gpath returns every path with a prefixed "-n " when dash is used as /bin/sh. Accoring to "man p1 echo" section "APPLICATION USAGE" applications should not rely on "echo -n" but use printf instead. The attached patch does exactly that. Kind regards Lars [1] https://bugs.gentoo.org/528452 --=20 Lars Wendler Gentoo package maintainer GPG: 4DD8 C47C CDFA 5295 E1A6 3FC8 F696 74AB 981C A6FC --MP_/HbMLPWFZZwUWKGe23/BJxNU Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-echo-n-cannot-be-expected-to-work-with-every-POSIX-s.patch =46rom a4766ccfe06b7bb7c445a9fd2efd0f8e2d55bbba Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 7 Nov 2014 13:35:08 +0100 Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shel= l. See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n" with "printf '%s'". Signed-off-by: Lars Wendler --- rpm/x2goserver.init | 4 ++-- x2goserver-xsession/etc/Xsession | 4 ++-- x2goserver/bin/x2gopath | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rpm/x2goserver.init b/rpm/x2goserver.init index a2e6619..842b17f 100644 --- a/rpm/x2goserver.init +++ b/rpm/x2goserver.init @@ -35,7 +35,7 @@ start() { mkdir $XSOCKDIR chmod 1777 $XSOCKDIR fi - echo -n $"Starting $prog: " + printf '%s' $"Starting $prog: " daemon $exec $OPTS retval=3D$? echo @@ -43,7 +43,7 @@ start() { } =20 stop() { - echo -n $"Stopping $prog: " + printf '%s' $"Stopping $prog: " killproc $exec retval=3D$? echo diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xse= ssion index 3b85b9e..e922dfc 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -26,9 +26,9 @@ message_nonl () { # pretty-print messages of arbitrary length (no trailing newline); use # xmessage if it is available and $DISPLAY is set MESSAGE=3D"$PROGNAME: $*" - echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2; + printf '%s' "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2; if [ -n "$DISPLAY" ] && which xmessage 1> /dev/null 2>&1; then - echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - + printf '%s' "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -f= ile - fi } =20 diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath index 8fb36a8..dc6b1ba 100755 --- a/x2goserver/bin/x2gopath +++ b/x2goserver/bin/x2gopath @@ -31,12 +31,12 @@ base=3D$(readlink -f "$base/.."); =20 # The following section is subject to substitution by distro packaging too= ls. case "$1" in - "base") echo -n "$base";; - "lib") echo -n "$base/lib/x2go";; - "libexec") echo -n "$base/lib/x2go";; - "share") echo -n "$base/share/x2go";; - "nx-x11") echo -n "$base/lib/nx/X11";; - "xinerama") echo -n "$base/lib/nx/X11/Xinerama";; + "base") printf '%s' "$base";; + "lib") printf '%s' "$base/lib/x2go";; + "libexec") printf '%s' "$base/lib/x2go";; + "share") printf '%s' "$base/share/x2go";; + "nx-x11") printf '%s' "$base/lib/nx/X11";; + "xinerama") printf '%s' "$base/lib/nx/X11/Xinerama";; *) exit 1;; esac; =20 --=20 2.1.3 --MP_/HbMLPWFZZwUWKGe23/BJxNU-- --Sig_/8PXTaHs71KyHfkZP6R6FisC Content-Type: application/pgp-signature Content-Description: Digitale Signatur von OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJUXOqSAAoJEPiazRVxLXTFIpQP/iRV5N2GOgaSwN9XvdgJJZhE N2g1wBqOiY243bjAapPtq8p1/pkHsGZtknLLVQd2IA5vNgb6V+EBpRoQDDje8Ewc vP3QctBSkSO2B4HlNem/XFjsQCzRc6ShPkYCPWVViJWYLTUAtMeolHAvWm3cqV9I 1jvl3Lw/YV2CK2tucV5WTE6lJTC3blTl+5LY2NSOcozs3IsSfmWGKlYtFbswdZlq 7UoDHoZWFhBim9t497mTG65erLLyLx12T1CBal40e8IFIeUa4PcWXDcSpuuFlg8n Z6iUCYIUjaJevGP0nIpL4cmAuQgqwve3aiycDRNDGnl/wxXux//ZTwlB2azFgeM1 JjkQ+93A8m9VoMubKuMgIvFYZ+ZlnsoVZ6TbdN2igBGbA8CJBswE5tO239xCGGnK +gNRpJie7rn48fZyZFVY+hWYbsazVYueSW8OdxeKCxEkb9UbzEpZFdWQF1FVEnuK uq5N7uljICLDzrpRobnoG8deStZWvqHHBWKCDm1IMK9pcDm9w7yhmBQvG03rc0sw 1GxHWw+CtoRikXVxPrfojCS8yy2Iy57hCa3h/GvwRexoR7tV0anlTR75R3pDILlu ghdzSan5rinKY9G+NccW+Ez3k3TYF8wqndQLi89GaC2HbbPngPwe118xCgmxv55I kUUGPAXfLSmiQYRtrntH =4pcw -----END PGP SIGNATURE----- --Sig_/8PXTaHs71KyHfkZP6R6FisC--