commit:     8ffbf0d3923ea3c752dccb508d011ae88c66c1af
Author:     Evgeny Grin <k2k <AT> narod <DOT> ru>
AuthorDate: Mon Jun 29 19:35:50 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 07:59:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffbf0d3

x11-misc/lightdm: Fixed lightdm Xsession wrapper to report only really sourced 
files

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/16496
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 x11-misc/lightdm/files/Xsession | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
index 50ce80fd3e1..d982a0ac89e 100644
--- a/x11-misc/lightdm/files/Xsession
+++ b/x11-misc/lightdm/files/Xsession
@@ -50,8 +50,8 @@ command="$@"
 xinitdir="/etc/X11/xinit/xinitrc.d"
 if [ -d "$xinitdir" ]; then
     for script in $xinitdir/*; do
-        echo "Loading xinit script $script"
         if [ -x "$script" -a ! -d "$script" ]; then
+            echo "Loading xinit script $script"
             . "$script"
         fi
     done
@@ -62,8 +62,8 @@ xsessionddir="/etc/X11/Xsession.d"
 if [ -d "$xsessionddir" ]; then
     for i in `ls $xsessionddir`; do
         script="$xsessionddir/$i"
-        echo "Loading X session script $script"
         if [ -r "$script"  -a -f "$script" ] && expr "$i" : 
'^[[:alnum:]_-]\+$' > /dev/null; then
+            echo "Loading X session script $script"
             . "$script"
         fi
     done

Reply via email to