summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/XFdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-18 08:05:41 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-18 08:05:41 +0000
commit0f881eacc9dd3d36486097322c189d0737b56154 (patch)
tree39cb844678231df9c0e83661ef1f00d783426a55 /perl-install/standalone/XFdrake
parent7f7d2c8b9facf43f657214501cfe0aef8a3a5481 (diff)
downloaddrakx-0f881eacc9dd3d36486097322c189d0737b56154.tar
drakx-0f881eacc9dd3d36486097322c189d0737b56154.tar.gz
drakx-0f881eacc9dd3d36486097322c189d0737b56154.tar.bz2
drakx-0f881eacc9dd3d36486097322c189d0737b56154.tar.xz
drakx-0f881eacc9dd3d36486097322c189d0737b56154.zip
- standalone.pm :
o make it be 'use strict' aware o factorize options managment in one place - standalone tools : o they all now support -h|--help -v|--version, ... o they can add their own options to %standalone::usages - harddrake : use std --testing/$::testing rather than its own --test option
Diffstat (limited to 'perl-install/standalone/XFdrake')
-rwxr-xr-xperl-install/standalone/XFdrake13
1 files changed, 1 insertions, 12 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 1c803ccd5..5c8311d3d 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -35,17 +35,6 @@ local $_ = join '', @ARGV;
my ($configure_this) = grep { !/^-/ } @ARGV;
$configure_this ||= 'everything';
-/-h/ || $configure_this !~ /^(resolution|monitor|everything|auto_install)/ and die <<'EOF';
-usage: XFdrake [--expert] [--noauto] [--auto] [everything]
- XFdrake [--noauto] monitor
- XFdrake resolution
-EOF
-
-my $auto = /-auto/;
-$::expert = /-expert/;
-$::noauto = /-noauto/;
-$::testing = /-testing/;
-
begin:
{
my $in = 'interactive'->vnew('su', 'X');
@@ -68,7 +57,7 @@ begin:
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($in, $raw_X, $in->do_pkgs, $::auto, $options);
}
} elsif ($configure_this eq 'auto_install') {
Xconfig::main::configure_everything_auto_install(Xconfig::default::configure(), $in->do_pkgs, {}, $options);