From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1183607-garchives=archives.gentoo.org@lists.gentoo.org> 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 6DBCC1381F3 for <garchives@archives.gentoo.org>; 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 79050E0966; 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 5C08CE0966 for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jun 2020 08:00:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 F060C34EEE0 for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jun 2020 07:59:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AC99274 for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jun 2020 07:59:55 +0000 (UTC) From: "Lars Wendler" <polynomial-c@gentoo.org> 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" <polynomial-c@gentoo.org> Message-ID: <1593503992.471fa32b97d78be42a08afb523ca578053989db8.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/lightdm/files/Xsession x11-misc/lightdm/lightdm-1.30.0-r1.ebuild x11-misc/lightdm/lightdm-1.30.0.ebuild X-VCS-Directories: x11-misc/lightdm/ x11-misc/lightdm/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 471fa32b97d78be42a08afb523ca578053989db8 X-VCS-Branch: master Date: Tue, 30 Jun 2020 07:59:55 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 13a4bc66-f305-4eff-97fa-4d6b9435b7f2 X-Archives-Hash: 6fab274ebf6fc9e2ae0843ae4244549c commit: 471fa32b97d78be42a08afb523ca578053989db8 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Jun 30 07:59:37 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=471fa32b x11-misc/lightdm: Revbump for changed Xsession file. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> x11-misc/lightdm/files/Xsession | 60 +++++++++++----------- ...htdm-1.30.0.ebuild => lightdm-1.30.0-r1.ebuild} | 0 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession index d982a0ac89e..1fe0110c9d9 100644 --- a/x11-misc/lightdm/files/Xsession +++ b/x11-misc/lightdm/files/Xsession @@ -5,36 +5,36 @@ echo "Running X session wrapper" # Load profile -for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do - if [ -f "$file" ]; then - echo "Loading profile from $file"; - . "$file" +for file in "/etc/profile" "${HOME}/.profile" "/etc/xprofile" "${HOME}/.xprofile" ; do + if [ -f "${file}" ] ; then + echo "Loading profile from ${file}"; + . "${file}" fi done # Load resources -for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do - if [ -f "$file" ]; then - echo "Loading resource: $file" - xrdb -nocpp -merge "$file" +for file in "/etc/X11/Xresources" "${HOME}/.Xresources" ; do + if [ -f "${file}" ] ; then + echo "Loading resource: ${file}" + xrdb -nocpp -merge "${file}" fi done # Load keymaps -for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do - if [ -f "$file" ]; then - echo "Loading keymap: $file" - setxkbmap `cat "$file"` +for file in "/etc/X11/Xkbmap" "${HOME}/.Xkbmap" ; do + if [ -f "${file}" ] ; then + echo "Loading keymap: ${file}" + setxkbmap $(cat "${file}") XKB_IN_USE=yes fi done # Load xmodmap if not using XKB -if [ -z "$XKB_IN_USE" ]; then - for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do - if [ -f "$file" ]; then - echo "Loading modmap: $file" - xmodmap "$file" +if [ -z "${XKB_IN_USE}" ] ; then + for file in "/etc/X11/Xmodmap" "${HOME}/.Xmodmap" ; do + if [ -f "${file}" ] ; then + echo "Loading modmap: ${file}" + xmodmap "${file}" fi done fi @@ -48,27 +48,27 @@ command="$@" # Run all system xinitrc shell scripts. xinitdir="/etc/X11/xinit/xinitrc.d" -if [ -d "$xinitdir" ]; then - for script in $xinitdir/*; do - if [ -x "$script" -a ! -d "$script" ]; then - echo "Loading xinit script $script" - . "$script" +if [ -d "${xinitdir}" ] ; then + for script in ${xinitdir}/* ; do + if [ -x "${script}" ] && [ ! -d "${script}" ] ; then + echo "Loading xinit script ${script}" + . "${script}" fi done fi # Load Xsession scripts xsessionddir="/etc/X11/Xsession.d" -if [ -d "$xsessionddir" ]; then - for i in `ls $xsessionddir`; do - script="$xsessionddir/$i" - if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then - echo "Loading X session script $script" - . "$script" +if [ -d "${xsessionddir}" ] ; then + for i in $(ls ${xsessionddir}) ; do + script="${xsessionddir}/${i}" + if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then + echo "Loading X session script ${script}" + . "${script}" fi done fi -echo "X session wrapper complete, running session $@" +echo "X session wrapper complete, running session ${@}" -exec $command +exec ${command} diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild similarity index 100% rename from x11-misc/lightdm/lightdm-1.30.0.ebuild rename to x11-misc/lightdm/lightdm-1.30.0-r1.ebuild