From a8aec7a0e6f505ed750ce61991012d6d47cc7bda Mon Sep 17 00:00:00 2001 From: Nicolas Salguero Date: Sat, 13 Aug 2016 01:02:31 +0200 Subject: use sessions from /usr/share/xsessions/ (mga#17617) instead of from /etc/X11/wmsession.d/ v2 (Thierry Vignaud): - prune useless stuff (removed by earlier perl_checker commit) - do not reparse twice the directory, just keep the existing order logic (which is slowly going towards /dev/null) --- sbin/chksession | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 sbin/chksession diff --git a/sbin/chksession b/sbin/chksession old mode 100644 new mode 100755 index 8afb6f9..108bc9b --- a/sbin/chksession +++ b/sbin/chksession @@ -21,7 +21,7 @@ Usage: $0 [OPTION]... -L: List window-managers including the order number -d=DIR, --dir=DIR: Specifies a directory of w-m configuration files. - Default is /etc/X11/wmsession.d/ + Default is /usr/share/xsessions/ -h, --help: Produce this help. @@ -40,9 +40,9 @@ sub parse_file { # parse a session descriptor file my ($fn) = @_; my $n; local $_ = cat($fn); - ($n = $1) =~ s| ||g if /^NAME=(.*)/m; - $e = $1 if /^EXEC=(.*)/m; - if (-x $e) { push @lf, $n; ($order{$n}) = $fn =~ m/(^[0-9][0-9])/; } + ($n = $1) =~ s| ||g if /^Name=(.*)/m; + push @lf, $n; + ($order{$n}) = $fn =~ m/(^[0-9][0-9])/; } usage(1) @@ -69,7 +69,7 @@ while ($ARGV[0] =~ /^--/ || $ARGV[0] =~ /^-/) { } # Parse all relevant files in session directory $dir -$dir = $test ? './wmsession.d/' : '/etc/X11/wmsession.d/' unless $dir; +$dir = $test ? './xsessions/' : '/usr/share/xsessions/' unless $dir; chdir $dir; for (<*>) { next if /.*~/; -- cgit v1.2.1