This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b2a73f948a95fa208a482ca5131f38023f74b092 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 02:57:27 2019 +0200 x2goserver/bin/x2gopath.in: rework quoting, variable usage, drop unnecessary semicolons etc. --- debian/changelog | 2 ++ x2goserver/bin/x2gopath.in | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12536fb..cda9111 100644 --- a/debian/changelog +++ b/debian/changelog @@ -92,6 +92,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin: rename x2gopath to x2gopath.in. - x2goserver/bin/x2gopath.in: use ${BASH_SOURCE[0]} instead of ${0}... for reasons. + - x2goserver/bin/x2gopath.in: rework quoting, variable usage, drop + unnecessary semicolons etc. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index 485b6ee..c8d3b8d 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -21,24 +21,24 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -base="${BASH_SOURCE[0]%/*}" +typeset base="${BASH_SOURCE[0]%/*}" if test "${base}" = "${BASH_SOURCE[0]}"; then - base="."; -fi; + base='.' +fi -base=$(readlink -f "$base/.."); +base="$(readlink -f "${base}/..")" # The following section is subject to substitution by distro packaging tools. -case "$1" in - "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;; +case "${1}" in + ('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; if test -t 1; then - echo ""; -fi; + printf '\n' +fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git