diff options
Diffstat (limited to 'perl-install/standalone/drakedm')
| -rwxr-xr-x[-rw-r--r--] | perl-install/standalone/drakedm | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index b5fb82ae4..a8be26875 100644..100755 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -1,6 +1,6 @@ #!/usr/bin/perl # DrakxDM -- Display Manager chooser -# Copyright (C) 2003-2004 Mandrakesoft (tvignaud@mandrakesoft.com) +# Copyright (C) 2003-2008 Mandriva (thierry.vignaud.com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,32 +24,31 @@ use common; use any; use interactive; use services; +use run_program; -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakedm-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakedm-mdk.png"; my $in = 'interactive'->vnew('su'); my $cfg_file = '/etc/sysconfig/desktop'; -my %dm = ('GNOME' => [ N("GDM (GNOME Display Manager)"), '/usr/bin/gdm', 'gdm' ], - 'KDM' => [ N("KDM (KDE Display Manager)"), '/usr/bin/kdm', 'kdebase-kdm' ], - 'KDE' => [ N("MdkKDM (Mandrakelinux Display Manager)"), '/usr/bin/mdkkdm', 'mdkkdm' ], - 'XDM' => [ N("XDM (X Display Manager)"), '/usr/bin/X11/xdm', 'xorg-x11' ], - ); +my @list = map { + my %l = map { /(\S+)=(.*)/ } cat_($_); + \%l; +} sort(glob("/usr/share/X11/dm.d/*.conf")); -my $dm; +my @_DESCRIPTIONS_for_i18n = ( + N("GDM (GNOME Display Manager)"), + N("SDDM (Simple Desktop Display Manager)"), + N("XDM (X Display Manager)"), +); -foreach (cat_($cfg_file)) { - $dm = uc($1) if /^DISPLAYMANAGER=(.*)$/; +if (!$::expert) { + @list = grep { -e $_->{EXEC} } @list; } -if (!$dm) { - $dm = 'KDE'; - log::explanations("Defaulting to $dm for display manager") -} - -my @raw_list = sort keys %dm; -my @list = $::expert ? @raw_list : (grep { -e $dm{$_}->[1] } @raw_list); +my ($dm_NAME) = cat_($cfg_file) =~ /^DISPLAYMANAGER=(.*)/m; +my $dm = (find { uc($_->{NAME}) eq uc($dm_NAME) } @list) || $list[0]; start: if ($in->ask_from(N("Choosing a display manager"), @@ -62,23 +61,19 @@ several different X sessions on your local machine at the same time.")), list => \@list, val => \$dm, type => 'list', - format => sub { $dm{$_[0]}[0] }, - sort => 1, + format => sub { translate($_[0]{DESCRIPTION}) }, } ] ) + && $dm ) { - ! -x $dm{$dm}[1] and do { $in->do_pkgs->ensure_is_installed($dm{$dm}[2], $dm{$dm}[1]) or goto start }; - substInFile { - s/^(DISPLAYMANAGER)=.*(\n|)//; - s/^\n//g; - $_ .= "\nDISPLAYMANAGER=$dm\n" if eof; - } $cfg_file; - log::explanations(qq(Switching to "$dm" display manager)); + $in->do_pkgs->ensure_is_installed($dm->{PACKAGE}, $dm->{EXEC}) or goto start; + addVarsInSh($cfg_file, { DISPLAYMANAGER => $dm->{NAME} }); + log::explanations(qq(Switching to "$dm->{NAME}" display manager)); if (any::running_window_manager()) { $in->ask_yesorno('', N("The change is done, do you want to restart the dm service?"), 1) and $in->ask_yesorno('', N("You are going to close all running programs and lose your current session. Are you really sure that you want to restart the dm service?"), 1) and - run_program::run("nohup", "/etc/rc.d/init.d/dm", "restart"); + run_program::raw({ detach => 1 }, 'systemctl', 'restart', 'display-manager.service', '>', '/dev/null', '2>', '/dev/null'); } } |