drakbug, drakfont, drakperm, draksplash, drakxtv, harddrake2,

net_monitor : final update for common cli options/help manager

8 files changed, 27 insertions, 63 deletions

diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 25fdf7bac..baed48438 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -49,6 +49,23 @@ Backup and Restore application
 --help                : show this message.
 --version             : show version name.
 "),
+           'drakbug' => N("[OPTIONS] [PROGRAM_NAME]
+
+OPTIONS:
+  --help            - print this help message.
+  --report          - program should be one of mandrake tools
+  --incident        - program should be one of mandrake tools"),
+           'drakfont' => N("Font Importation and monitoring application                                     
+--windows_import : import from all available windows partitions.
+--xls_fonts      : show all fonts that already exist from xls
+--strong         : strong verification of font.
+--install        : accept any font file and any directry.
+--uninstall      : uninstall any font or any directory of font.
+--replace        : replace all font if already exist
+--application    : 0 none application.
+                 : 1 all application available supported.
+                 : name_of_application like  so for staroffice 
+                 : and gs for ghostscript for only this one."),
 	      'draksec' => N("[OPTIONS]...
 	      --debug         print debugging information"),
            'drakTermServ' => N("[OPTIONS]...
@@ -65,6 +82,15 @@ Mandrake Terminal Server Configurator
 	      'drakupdate_fstab' => " [--add | --del] <device>\n",
 	      'keyboardrake' => N("[keyboard]"),
            'logdrake' => N("[--file=myfyle] [--word=myword] [--explain=regexp] [--alert]"),
+           'net_monitor' => N("[OPTIONS]
+Network & Internet connection and monitoring application
+
+--defaultintf interface : show this interface by default
+--connect : connect to internet if not already connected
+--disconnect : disconnect to internet if already connected
+--force : used with (dis)connect : force (dis)connection.
+--status : returns 1 if connected 0 otherwise, then exit.
+--quiet : don't be interactive. To be used with (dis)connect."),
 	      'printerdrake' => N(" [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"),
 	      'rpmdrake' => N("[OPTION]...
   --no-confirmation      don't ask first confirmation question in MandrakeUpdate mode
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index b5e4e4053..b8e1c3a3e 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -36,23 +36,7 @@ my $version = "0.9.0";
 my $prog;
 my $incident=0;
 
-sub usage {
-    print STDERR N("drakbug version %s
-Copyright (C) 2002 MandrakeSoft.
-This is free software and may be redistributed under the terms of the GNU GPL.
-
-usage: drakbug [OPTIONS] [PROGRAM_NAME]
-
-OPTIONS:
-", $version) . N("  --help            - print this help message.
-") . "\n" . N("  --report          - program should be one of mandrake tools
-") . "\n" . N("  --incident        - program should be one of mandrake tools
-");
-    exit(0);
-}
-
 while (defined($_ = shift @ARGV)) {
-    /^--help$/ and do { usage; next };
     /^--report$/ and do { $prog = shift @ARGV };
     /^--incident$/ and do {$incident = 1 ; $prog = shift @ARGV };
 }
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index ec8386b5f..f9b5e2ad6 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -95,22 +95,6 @@ use diagnostics;
 
 my $in = 'interactive'->vnew( 'su', 'network' );
 
-if ( "@ARGV" =~ /--help|-h/ ) {
-    print q(Font Importation and monitoring application
---windows_import : import from all available windows partitions.
---xls_fonts      : show all fonts that already exist from xls
---strong         : strong verification of font.
---install        : accept any font file and any directry.
---uninstall      : uninstall any font or any directory of font.
---replace        : replace all font if already exist
---application    : 0 none application.
-                 : 1 all application available supported.
-                 : name_of_application like  so for staroffice 
-                 : and gs for ghostscript for only this one.
-);
-    exit(0);
-}
-
 #   global variables needed by each functions
 my $xlsfonts = 0;
 my $windows  = 0;
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index 114185a75..4a94bcf32 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -10,10 +10,6 @@ use interactive;
 my $in = 'interactive'->vnew('su', 'default');
 local $_ = join '', @ARGV;
 
-/-h/ and die N("no help implemented yet.\n");
-/-version/ and die 'version: $Id$'."\n";
-
-
 #- vars declaration
 my ($default_perm_level) = "level ".chomp_(`cat /etc/sysconfig/msec | grep SECURE_LEVEL= |cut -d= -f2`);
 my %CURENT;
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index 69da21275..e5840b568 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -21,10 +21,6 @@ if ($::isEmbedded) {
 }
 
 my $in = 'interactive'->vnew('su', 'default');
-local $_ = join '', @ARGV;
-
-/-h/ and die N("no help implemented yet.\n");
-/-version/ and die 'version: $Id$'."\n";
 
 my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window ("toplevel");
 $window->signal_connect(delete_event => sub { $::isEmbedded ? kill(USR1, $::CCPID) : &CloseAppWindow });
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index c0d76ea3d..75f122f99 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -73,7 +73,6 @@ You can install it by typing \"urpmi xawtv\" as root, in a console.")));
 
 	   # default to pal since most people use that
 	   $norm = "PAL";
-	   if ("@ARGV" !~ /--help|-h/) {
 		  my %countries =
 			 (
 			  "ar" => [ "argentina" ],
@@ -99,7 +98,6 @@ You can install it by typing \"urpmi xawtv\" as root, in a console.")));
 			 }
 		  }
 		  log::l("[drakxtv] guess lang=>$_, norm=>$norm, area=>$ftable_id");
-	   }
 
 	   if ($in->ask_from("TVdrake", N("Please,\ntype in your tv norm and country"),
 					 [
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 72385a07a..3a798b021 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -5,10 +5,4 @@ use standalone;
 use common;
 use harddrake::ui;
 
-if ("@ARGV" =~ /--help|-h/) {
-    print "Harddrake 2\n", $harddrake::ui::license, N("\nUsage: harddrake [-h|--help] [--test]\n");
-    exit;
-}
-$::isStandalone=1;
-
 harddrake::ui->new;
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index b12863418..d30efdf61 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -21,30 +21,16 @@
 use Gtk;
 use lib qw(/usr/lib/libDrakX);
 
+use strict;
 use standalone;     #- warning, standalone must be loaded very first, for 'explanations'
 
 use interactive;
 use my_gtk qw(:helpers :wrappers);
-#-use Data::Dumper;
 use common;
-use strict;
 use network::netconnect;
 use network::tools;
 use MDK::Common::Globals "network", qw($in $prefix $connect_file $disconnect_file $connect_prog);
 
-if ("@ARGV" =~ /--help|-h/) {
-    print q(Network & Internet connection and monitoring application
-
---defaultintf interface : show this interface by default
---connect : connect to internet if not already connected
---disconnect : disconnect to internet if already connected
---force : used with (dis)connect : force (dis)connection.
---status : returns 1 if connected 0 otherwise, then exit.
---quiet : don't be interactive. To be used with (dis)connect.
-);
-    exit(0);
-}
-
 if ("@ARGV" =~ /--status/) { print connected(); exit(0) }
 my $force = "@ARGV" =~ /--force/;
 my $quiet = "@ARGV" =~ /--quiet/;