Changeset 894 for dasscm/trunk/usr

Timestamp:

Jun 26, 2010, 2:40:09 PM (14 years ago)

Author:

joergs

Message:

complete handles global options

File:

• dasscm/trunk/usr/bin/dasscm (modified) (5 diffs)

dasscm/trunk/usr/bin/dasscm

@@ -8 +8 @@
   qw($DASSCM_PROD $DASSCM_REPO $USER $DASSCM_USERNAME $DASSCM_USER $DASSCM_PASSWORD $SHELL);
 use Cwd;
-use Getopt::Long;
+use Getopt::Long qw(GetOptionsFromArray);
 use File::Basename;
 use File::Compare;
@@ -18 +18 @@
 use Term::ReadKey;
 
-#use Data::Dumper;
+use Data::Dumper;
 
 #####################################################################
@@ -39 +39 @@
 my $config_file = "/etc/dasscm.conf";
 my $config      = get_config($config_file);
+
+my @OPTIONS_GLOBAL = ( 'help', 'verbose' );
 
 my %COMMANDS = (
@@ -1568 +1570 @@
 sub complete(@)
 {
-    use Data::Dumper;
-
-    my $number_arguments = @_;
     my @input            = @_;
-
-    # TODO: check global options
-
-    if ( $number_arguments <= 1 ) {
-
-        # complete dasscm commands
-        my $input = $input[0] || "";
-        map { m/^$input/ && print $_, "\n" } ( keys %COMMANDS );
-    } else {
-
-        # complete dasscm parameter
-        my $command = get_command_uniform_name( $input[0] );
-        my @params  = get_command_possible_params( $input[0] );
-        if ($verbose) { print "params: ", Dumper(@params); }
-
-        # arg 1:    dasscm
-        # arg 2:    command
-        # arg 3-x:  parameter, therefore parameter_number = $number_arguments - 2
-        my $parameter_number = $number_arguments - 2;
-        if ( defined( $params[$parameter_number] )
-            && $params[$parameter_number] )
-        {
-            my $param = $params[$parameter_number];
-            if ($verbose) { print "param used: ", $param, "\n"; }
-            if ( $param eq "PATH_PROD" ) {
-                complete_path( $input[ $number_arguments - 1 ] );
-            } elsif ( $param eq "PATH_REPO" ) {
-                complete_repopath( $input[ $number_arguments - 1 ] );
+    my %options_complete = ();
+
+    # check and remove global options. if options are wrong, nothing to do
+    if( GetOptionsFromArray( \@input, \%options_complete, @OPTIONS_GLOBAL ) ) {
+        my $number_arguments = @input;
+        if ( $number_arguments <= 1 ) {
+
+            # complete dasscm commands
+            my $input = $input[0] || "";
+            map { m/^$input/ && print $_, "\n" } ( keys %COMMANDS );
+        } else {
+
+            # complete dasscm parameter
+            my $command = get_command_uniform_name( $input[0] );
+            my @params  = get_command_possible_params( $input[0] );
+            if ($verbose) { print "params: ", Dumper(@params); }
+
+            # arg 1:    dasscm
+            # arg 2:    command
+            # arg 3-x:  parameter, therefore parameter_number = $number_arguments - 2
+            my $parameter_number = $number_arguments - 2;
+            if ( defined( $params[$parameter_number] )
+                && $params[$parameter_number] )
+            {
+                my $param = $params[$parameter_number];
+                if ($verbose) { print "param used: ", $param, "\n"; }
+                if ( $param eq "PATH_PROD" ) {
+                    complete_path( $input[ $number_arguments - 1 ] );
+                } elsif ( $param eq "PATH_REPO" ) {
+                    complete_repopath( $input[ $number_arguments - 1 ] );
+                }
             }
         }
@@ -1667 +1669 @@
 # stops at first non-option
 Getopt::Long::Configure( 'require_order' );
-if( not GetOptions( \%options, 'help', 'verbose' ) ) {
+if( not GetOptions( \%options, @OPTIONS_GLOBAL ) ) {
     usage();
     exit $RETURN_NOK;