diff options
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index bbc051bcc..dc0d112e1 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1150,13 +1150,12 @@ sub ask_user_and_root { } sub sessions() { + my @l; my @dir_wm = qw(xsessions wayland-sessions); foreach my $dwm (@dir_wm) { - my $old = chdir("$::prefix/usr/share/$dwm/"); - my @l = map { s/.desktop$//; $_ } glob("*.desktop"); - chdir($old); - @l; + push @l, map { s/.desktop$//; basename($_) } glob("$::prefix/usr/share/$dwm/*.desktop"); } + @l; } sub sessions_with_order() { my %h = map { /(.*)=(.*)/ } split(' ', run_program::rooted_get_stdout($::prefix, '/usr/sbin/chksession', '-L')); @@ -1451,7 +1450,7 @@ sub selectLanguage_standalone { ]); $locale->{utf8} = !$non_utf8; lang::set($locale); - c::init_setlocale() if $in->isa('interactive::gtk'); + common::init_setlocale() if $in->isa('interactive::gtk'); lang::lang_changed($locale) if $old_lang ne $locale->{lang}; } |