[X2Go-Commits] [x2goserver] 02/05: x2goserver-xsession/Makefile: drop useless use of cat, add debugging to see whether symlinks or a directory has been added.

[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 aa6882b7864b233e274879e63a71f3939c7ea185
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 27 21:43:04 2023 +0100

    x2goserver-xsession/Makefile: drop useless use of cat, add debugging to see whether symlinks or a directory has been added.
---
 debian/changelog             | 2 ++
 x2goserver-xsession/Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 21af52b3..47efce12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -418,6 +418,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       "${clipboard}" variable already includes the "clipboard" key.
     - x2goserver.spec: escape percent signs in comments, getting rid of
       warnings in obs-build's spec file parser.
+    - x2goserver-xsession/Makefile: drop useless use of cat, add debugging to
+      see whether symlinks or a directory has been added.
   * 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/Makefile b/x2goserver-xsession/Makefile
index ea15a314..8825d884 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -60,7 +60,7 @@ install_config:
 	if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONOPTIONSDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.options.d; $(INSTALL_SYMLINK) $(XSESSIONOPTIONSDIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; fi; fi
 	if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ] || [ -e /etc/rt-os-release ] || [ -e /etc/slackware-version ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi
 	if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ] || [ -e /etc/rt-os-release ] || [ -e /etc/slackware-version ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi
-	if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null || [ -d /usr/share/doc/packages/brp-check-suse ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi
+	if [ -e /etc/os-release ] && grep "suse" 1>/dev/null < /etc/os-release || [ -d /usr/share/doc/packages/brp-check-suse ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) -v $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) -v $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi
 
 install_man:
 

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