This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver.
commit 135419f63f611847630813d3b3f706c46ed6da83 Author: Mihai Moldovan <[email protected]> Date: Mon Feb 27 21:58:24 2023 +0100 x2goserver-xsession/etc/Xsession: check for *SuSE via /usr/lib/os-release and /etc/os-release and generally refine checking layout a bit. --- debian/changelog | 3 +++ x2goserver-xsession/etc/Xsession | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ac55391a..84294b52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -424,6 +424,9 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium /usr/etc. - x2goserver.spec: support UsrEtc(Move) for OpenSuSE Tumbleweed for Xresources symlink. + - x2goserver-xsession/etc/Xsession: check for *SuSE via + /usr/lib/os-release and /etc/os-release and generally refine checking + layout a bit. * debian/control: + Build-depend upon lsb-release for distro version detection. + Pull in base64 as a run-time dependency. We'll need it in scripts. diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 6466bc4d..cc03e6a5 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -167,7 +167,16 @@ if [ -f /etc/debian_version ] || [ -f /etc/devuan_version ]; then done set -e fi -elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ] || [ -f /etc/slackware-version ]; then +elif [ -f /etc/redhat-release ] || \ + [ -f /etc/gentoo-release ] || \ + { \ + { [ -e '/usr/lib/os-release' ] && grep 'suse' < '/usr/lib/os-release' 1>'/dev/null' ; } || \ + { [ -e '/etc/os-release' ] && grep 'suse' < '/etc/os-release' 1>'/dev/null' ; } || \ + [ -f /etc/SUSE-brand ] || \ + [ -f /etc/SuSE-release ] ; \ + } || \ + [ -f /etc/os-rt-release ] || \ + [ -f /etc/slackware-version ]; then # define a fallback... (should never be needed). The XSESSION_EXEC var gets set in # X2Go's x2goruncommand script and can be used with obsolete switchdesk or with -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git _______________________________________________ x2go-commits mailing list [email protected] https://lists.x2go.org/listinfo/x2go-commits
