[X2Go-Commits] [x2goserver] 02/03: x2goserver/bin/x2gopath.in: avoid spurious warning messages by canonicalizing installed path values.

[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 4e3884f05bbd35a924e7890d02bd907908f3d495
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jun 25 14:42:22 2019 +0200

    x2goserver/bin/x2gopath.in: avoid spurious warning messages by canonicalizing installed path values.
---
 debian/changelog           |  2 ++
 x2goserver/bin/x2gopath.in | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c375164..78af26a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -143,6 +143,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
       RPM-based section.
     - x2goserver-xsession/Makefile: generate RPM-based symlinks for Slackware.
     - x2goserver/bin/x2gopath.in: more quoting.
+    - x2goserver/bin/x2gopath.in: avoid spurious warning messages by
+      canonicalizing installed path values.
   * 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 50ed949..493845b 100755
--- a/x2goserver/bin/x2gopath.in
+++ b/x2goserver/bin/x2gopath.in
@@ -34,6 +34,27 @@ fi
 
 base="$(readlink -f "${base}/..")"
 
+# Try to sanitize install locations.
+typeset installed_prefix_sanitized="$(readlink -e "${installed_prefix}")"
+typeset installed_libdir_sanitized="$(readlink -e "${installed_libdir}")"
+typeset installed_nxlibdir_sanitized="$(readlink -e "${installed_nxlibdir}")"
+typeset installed_sharedir_sanitized="$(readlink -e "${installed_sharedir}")"
+typeset -a desc_arr
+typeset -a val_arr
+desc_arr=( 'prefix' 'library path' 'nx path' 'share path' )
+val_arr=( 'prefix' 'libdir' 'nxlibdir' 'sharedir' )
+
+typeset -i i='0'
+for i in "${!desc_arr[@]}"; do
+	typeset val_indirect="installed_${val_arr[i]}"
+	typeset sanitized_val_indirect="${val_indirect}_sanitized"
+	if [ -z "${!sanitized_val_indirect}" ]; then
+		printf 'WARNING: X2Go Server was originally installed with %s %s, but this path does not on this machine. There is potential for breakage.\n' "${!desc_arr[i]}" "${!val_indirect}"
+	else
+		typeset "${val_indirect}=${!sanitized_val_indirect}"
+	fi
+done
+
 if [ "${base}" != "${installed_prefix}" ]; then
 	printf 'WARNING: X2Go Server was originally installed into %s, but seems to have been re-rooted to %s. There is potential for breakage.\n' "${installed_prefix}" "${base}" >&2
 fi

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