summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin <k2k@narod.ru>2020-06-29 22:35:50 +0300
committerLars Wendler <polynomial-c@gentoo.org>2020-06-30 09:59:52 +0200
commit8ffbf0d3923ea3c752dccb508d011ae88c66c1af (patch)
tree93d6cb6d611975197a81d743e97acb030e831924 /x11-misc/lightdm
parentdev-tex/tex4ht: Do not install the htcmd binary. (diff)
downloadgentoo-8ffbf0d3923ea3c752dccb508d011ae88c66c1af.tar.gz
gentoo-8ffbf0d3923ea3c752dccb508d011ae88c66c1af.tar.bz2
gentoo-8ffbf0d3923ea3c752dccb508d011ae88c66c1af.zip
x11-misc/lightdm: Fixed lightdm Xsession wrapper to report only really sourced files
Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru> Closes: https://github.com/gentoo/gentoo/pull/16496 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'x11-misc/lightdm')
-rw-r--r--x11-misc/lightdm/files/Xsession4
1 files changed, 2 insertions, 2 deletions
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
index 50ce80fd3e19..d982a0ac89e9 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