This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 90bbbb6f9c21386c4d576e0f017c59a25aa7de9b Author: Lars Wendler <polynomial-c@gentoo.org> Date: Fri Nov 28 05:13:55 2014 +0100 Use "printf" instead of "echo -n". (Fixes: #668). --- debian/changelog | 4 ++++ rpm/x2goserver.init | 4 ++-- x2goserver-xsession/etc/Xsession | 4 ++-- x2goserver/bin/x2gopath | 12 ++++++------ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 967f45f..1dea069 100644 --- a/debian/changelog +++ b/debian/changelog @@ -229,6 +229,10 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium only capture the file descriptor backreference in the regex and send any close failures to syslog. (Fixes: #678). + [ Lars Wendler ] + * New upstream version (4.0.1.19): + - Use "printf" instead of "echo -n". (Fixes: #668). + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 x2goserver (4.0.1.18-0x2go1) unstable; urgency=medium 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=$? echo @@ -43,7 +43,7 @@ start() { } stop() { - echo -n $"Stopping $prog: " + printf '%s' $"Stopping $prog: " killproc $exec retval=$? echo diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 2104c9c..ab32a10 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="$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 -file - fi } 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=$(readlink -f "$base/.."); # The following section is subject to substitution by distro packaging tools. 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; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git