final switch of drakbackup, logdrake and scannerdrake

to new option scheme

4 files changed, 14 insertions, 34 deletions

diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index a0b8cd158..285557781 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -36,18 +36,16 @@ use log;
 use c;
 
 
-#my %options;
-#my @l = @ARGV;
-#while (my $e = shift @l) {
-"    my ($option) = $e =~ /--?(.*)/ or next;
-#    if ($option =~ /(.*?)=(.*)/) {
-#	$options{$1} = $2;
-#    } else {
-#	$options{$option} = '';
-#    }
-"}
-#$::expert = defined(delete $options{expert});
-#$::testing = defined(delete $options{testing});
+my %options;
+my @l = @ARGV;
+while (my $e = shift @l) {
+    my ($option) = $e =~ /--?(.*)/ or next;
+    if ($option =~ /(.*?)=(.*)/) {
+	$options{$1} = $2;
+    } else {
+	$options{$option} = '';
+    }
+}
 
 my @types = qw(hd nfs smb dav removable fileshare);
 my ($type, $para) = ('hd', '');
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 0394d147f..99f626588 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -128,24 +128,10 @@ use common;
 use Time::localtime;
 use detect_devices;
 
-if ("@ARGV" =~ /--help|-h/) {
-    print q(Backup and Restore application
-
---default             : save default directories.
---debug		      : show all debug messages.
---show-conf           : list of files or directories to backup.
---config-info	      : explain configuration file options (for non-X users).
---daemon              : use daemon configuration. 
---help                : show this message.
---version             : show version name.
-);
-    exit(0);
-}
-
-if ("@ARGV" =~ /--version/) {
-    print "Drakbackup Version 1.2\n";
-    exit(0);
-}
+#if ("@ARGV" =~ /--version/) {
+#    print "Drakbackup Version 1.2\n";
+#    exit(0);
+#}
 
 # Backend Options.
 # make this global for status screen      
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 77406ab5b..442e5595b 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -40,8 +40,6 @@ if ($::isEmbedded) {
 
 #- parse arguments list.
 for (@ARGV) {
-    /^--version$/ and die 'version: $Id$ '."\n";
-    /^--help$/ and die 'logdrake [--version] [--file=myfyle] [--word=myword] [--explain=regexp] [--alert]';
     /^--explain=(.*)$/ and do { $::isExplain = ($::Explain) = $1; $::isFile = 1; $::File = "/var/log/explanations"; next };
     /^--file=(.*)$/ and do { $::isFile = ($::File) = $1; next };
     /^--word=(.*)$/ and do { $::isWord = ($::Word) = $1; next };
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index c89ff8754..810382d37 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -27,8 +27,6 @@ use common;
 use scanner;
 
 foreach (@ARGV) {
-    /^--version$/ and die 'version: $Id$ '."\n";
-    /^--help$/ and die 'logdrake [--version] [--help] [--manual] [--device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] [--dynamic=dev]';
     /^--update-usbtable$/ and do { scanner::updateScannerDBfromUsbtable(); exit };
     /^--update-sane=(.*)$/ and do { scanner::updateScannerDBfromSane($1); exit };
     /^--manual$/ and $::Manual=1;