From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D83501381F3 for ; Tue, 30 Jun 2020 08:00:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D01ADE0975; Tue, 30 Jun 2020 08:00:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6BB4E0975 for ; Tue, 30 Jun 2020 08:00:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B9E934F122 for ; Tue, 30 Jun 2020 07:59:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D5D426 for ; Tue, 30 Jun 2020 07:59:55 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1593503992.8ffbf0d3923ea3c752dccb508d011ae88c66c1af.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/lightdm/files/Xsession X-VCS-Directories: x11-misc/lightdm/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8ffbf0d3923ea3c752dccb508d011ae88c66c1af X-VCS-Branch: master Date: Tue, 30 Jun 2020 07:59:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7fefa798-7039-409e-90f7-23d50032f098 X-Archives-Hash: ca6760ba9ed18011c9921d00fdc19564 commit: 8ffbf0d3923ea3c752dccb508d011ae88c66c1af Author: Evgeny Grin narod ru> AuthorDate: Mon Jun 29 19:35:50 2020 +0000 Commit: Lars Wendler gentoo 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) narod.ru> Closes: https://github.com/gentoo/gentoo/pull/16496 Signed-off-by: Lars Wendler 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