diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-01-10 13:38:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-01-10 13:38:50 +0000 |
| commit | 2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1 (patch) | |
| tree | 01de6b030ad01e8f7ad728ce01742317a6963207 /perl-install/standalone/XFdrake | |
| parent | a864aa06bfc1fe86c37633158926f287110af834 (diff) | |
| download | drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.tar drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.tar.gz drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.tar.bz2 drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.tar.xz drakx-2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1.zip | |
simplify and factorize
(now works on 1.upgrade 2.install 3.install + change existing config)
Diffstat (limited to 'perl-install/standalone/XFdrake')
| -rwxr-xr-x | perl-install/standalone/XFdrake | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 9ce09160b..44f0e28d2 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -48,17 +48,7 @@ begin: if ($configure_this eq 'everything') { check_XFree($in); - my $raw_X = Xconfig::xfree->read; - my $default = Xconfig::default::configure(); - my $has_conf = @{$raw_X->{xfree3}} || @{$raw_X->{xfree4}}; - $raw_X->{xfree3} = $default->{xfree3} if !@{$raw_X->{xfree3}}; - $raw_X->{xfree4} = $default->{xfree4} if !@{$raw_X->{xfree4}}; - - if ($has_conf) { - Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, $options); - } else { - Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $::auto, $options); - } + Xconfig::main::configure_everything_or_configure_chooser($in, $options, $::auto); } elsif ($configure_this eq 'auto_install') { Xconfig::main::configure_everything_auto_install(Xconfig::default::configure(), $in->do_pkgs, {}, $options); } elsif ($configure_this eq 'monitor') { |