[X2Go-Commits] [x2goserver] 03/03: x2goserver/bin/x2gopath.in: avoid double slashes since we now know that paths will be canonical.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit 63ab1f9c1bf06e9ee52b0bc2ca28e6e2d06a7576
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jun 25 14:43:04 2019 +0200

    x2goserver/bin/x2gopath.in: avoid double slashes since we now know that paths will be canonical.
---
 debian/changelog           |  2 ++
 x2goserver/bin/x2gopath.in | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78af26a..785c9c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -145,6 +145,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
     - x2goserver/bin/x2gopath.in: more quoting.
     - x2goserver/bin/x2gopath.in: avoid spurious warning messages by
       canonicalizing installed path values.
+    - x2goserver/bin/x2gopath.in: avoid double slashes since we now know that
+      paths will be canonical.
   * 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 493845b..388cef3 100755
--- a/x2goserver/bin/x2gopath.in
+++ b/x2goserver/bin/x2gopath.in
@@ -68,12 +68,10 @@ if [ "${x2go_share_subdir}" = "${installed_sharedir}" ] || [ "${x2go_lib_subdir}
 fi
 
 # Hopefully helpful diagnostic messages.
-typeset x2go_libpath="${base}/${x2go_lib_subdir}"
-typeset x2go_sharepath="${base}/${x2go_share_subdir}"
-typeset x2go_nxx11path="${base}/${x2go_nxlib_subdir}/X11"
-typeset x2go_xineramapath="${base}/${x2go_nxlib_subdir}/X11/Xinerama"
-typeset -a desc_arr
-typeset -a val_arr
+typeset x2go_libpath="${base}${x2go_lib_subdir}"
+typeset x2go_sharepath="${base}${x2go_share_subdir}"
+typeset x2go_nxx11path="${base}${x2go_nxlib_subdir}/X11"
+typeset x2go_xineramapath="${base}${x2go_nxlib_subdir}/X11/Xinerama"
 desc_arr=( 'library path' 'share path' 'nx-X11 path' 'xinerama path' )
 val_arr=( 'x2go_libpath' 'x2go_sharepath' 'x2go_nxx11path' 'x2go_xineramapath' )
 

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