[X2Go-Commits] [x2goserver] 16/17: x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the lib-subdir detection.

[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 6ffc9ee3fcda5807fd56f0d9160700bb8f5aaaa5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 23 04:29:49 2019 +0200

    x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the lib-subdir detection.
---
 debian/changelog           |  2 ++
 x2goserver/bin/x2gopath.in | 17 ++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96f3b82..a268a0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -107,6 +107,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
     - x2goserver/bin/x2gopath.in: switch to bash.
     - x2goserver/bin/x2gopath.in: fix warning message to also include
       SHAREDIR.
+    - x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the
+      lib-subdir detection.
   * 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 29a9b4f..1c5b51a 100755
--- a/x2goserver/bin/x2gopath.in
+++ b/x2goserver/bin/x2gopath.in
@@ -24,6 +24,7 @@
 
 typeset installed_prefix='@@PREFIX@@'
 typeset installed_libdir='@@LIBDIR@@'
+typeset installed_nxlibdir='@@NXLIBDIR@@'
 typeset installed_sharedir='@@SHAREDIR@@'
 
 typeset base="${BASH_SOURCE[0]%/*}"
@@ -39,25 +40,19 @@ fi
 
 typeset x2go_share_subdir="${installed_sharedir#${installed_prefix}}"
 typeset x2go_lib_subdir="${installed_libdir#${installed_prefix}}"
+typeset x2go_nxlib_subdir="${installed_nxlibdir#${installed_prefix}}"
 
-if [ "${x2go_share_subdir}" = "${installed_sharedir}" ] || [ "${x2go_lib_subdir}" = "${installed_libdir}" ]; then
-	printf 'WARNING: X2Go Server was built with a SHAREDIR (%s) or LIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_sharedir}" "${installed_libdir}" "${installed_prefix}" >&2
+if [ "${x2go_share_subdir}" = "${installed_sharedir}" ] || [ "${x2go_lib_subdir}" = "${installed_libdir}" ] || [ "${x2go_nxlib_subdir}" = "${installed_nxlibdir}" ]; then
+	printf 'WARNING: X2Go Server was built with a SHAREDIR (%s), LIBDIR (%s) or NXLIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_sharedir}" "${installed_libdir}" "${installed_nxlibdir}" "${installed_prefix}" >&2
 fi
 
-# Try to fetch the system library dir.
-# Drop leading slashes.
-typeset lib_subdir="$(sed -e 's#^/*##g' <<< "${x2go_lib_subdir}")"
-# Extract first element - should be the library directory.
-lib_subdir="${lib_subdir%%/*}"
-
 # Distributions should not modify the following section, but rather build the package with their custom PREFIX, LIBDIR, SHAREDIR etc. values.
 case "${1}" in
 	('base') printf '%s' "${base}";;
 	('lib'|'libexec') printf '%s' "${base}/${x2go_lib_subdir}";;
 	('share') printf '%s' "${base}/${x2go_share_subdir}";;
-	# Assume that X2Go Server and nx-libs share the same library subdir.
-	('nx-x11') printf '%s' "${base}/${lib_subdir}/nx/X11";;
-	('xinerama') printf '%s' "${base}/${lib_subdir}/nx/X11/Xinerama";;
+	('nx-x11') printf '%s' "${base}/${x2go_nxlib_subdir}/X11";;
+	('xinerama') printf '%s' "${base}/${x2go_nxlib_subdir}/X11/Xinerama";;
 	(*) exit 1;;
 esac;
 

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