- 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

1 files changed, 1 insertions, 18 deletions

diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index ea3cf7239..741d9d19e 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
@@ -58,23 +58,6 @@ my %fields =
      );
 
 
-our $license = 'Copyright (C) 1999-2002 MandrakeSoft by tvignaud@mandrakesoft.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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-';
-
 my ($in, %IDs, $pid, $w);
 
 my %options;
@@ -121,7 +104,7 @@ sub detect {
     foreach (@harddrake::data::tree) {
         my ($Ident, $title, $icon, $configurator, $detector) = @$_;
         next if ref($detector) ne "CODE"; #skip class witouth detector
-        next if $Ident =~ /(MODEM|PRINTER)/ && "@ARGV" =~ /test/;
+        next if $Ident =~ /(MODEM|PRINTER)/ && $::testing;
         next if $Ident =~ /MODEM/ && !$options{MODEMS_DETECTION};
         next if $Ident =~ /PRINTER/ && !$options{PRINTERS_DETECTION};
 #    print N("Probing %s class\n", $Ident);