This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 78ffdf5 x2goserver-xsession/Makefile: generate RPM-based symlinks for Slackware. new 10b2001 x2goserver/bin/x2gopath.in: more quoting. new 4e3884f x2goserver/bin/x2gopath.in: avoid spurious warning messages by canonicalizing installed path values. new 63ab1f9 x2goserver/bin/x2gopath.in: avoid double slashes since we now know that paths will be canonical. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 +++++ x2goserver/bin/x2gopath.in | 33 ++++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 10b2001103eaf5b55841d5632e6b60cbfd0e873f Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jun 25 13:59:52 2019 +0200 x2goserver/bin/x2gopath.in: more quoting. --- debian/changelog | 1 + x2goserver/bin/x2gopath.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f64cb79..c375164 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver-xsession/etc/Xsession: add support for Slackware in the RPM-based section. - x2goserver-xsession/Makefile: generate RPM-based symlinks for Slackware. + - x2goserver/bin/x2gopath.in: more quoting. * 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 8646a0e..50ed949 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -72,7 +72,7 @@ case "${1}" in ('share') printf '%s' "${x2go_sharepath}";; ('nx-x11') printf '%s' "${x2go_nxx11path}";; ('xinerama') printf '%s' "${x2go_xineramapath}";; - (*) exit 1;; + (*) exit '1';; esac; if [ -t '1' ]; then -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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@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
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@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
-
git-admin＠x2go.org