fix bash completion for simple command classes like 'list'.

diff --git a/PVE/CLIHandler.pm b/PVE/CLIHandler.pm
index 904e54e738c36a64a6f7592d2d544c16c1c1a77d..801f5301367f3e6fa918b2b8405ac3b553dc945d 100644 (file)
--- a/PVE/CLIHandler.pm
+++ b/PVE/CLIHandler.pm
@@ -369,7 +369,6 @@ my $print_bash_completion = sub {
     };
 
     # positional arguments
-    $pos++ if $simple_cmd;
     if ($pos < scalar(@$arg_param)) {
        my $pname = $arg_param->[$pos];
        &$print_parameter_completion($pname);

diff --git a/pveclient b/pveclient
index 4a0ae506da21c435d84b5b9deaf5e1d8352bf978..52f40a7afdec61a405bd32caf1328de3f39154c5 100755 (executable)
--- a/pveclient
+++ b/pveclient
@@ -69,10 +69,16 @@ if (my $method = $method_map->{$cmd}) {
     if ($ENV{COMP_LINE} =~ m/^(.*pveclient\s+($cmdlist)\s+)(.*)$/) {
        my $cmd = $2;
        my $class = $cli_class_handlers->{$cmd} || die "internal error";
-       $ENV{COMP_LINE} = "pveclient $3";
-       $ENV{COMP_POINT} = length($ENV{COMP_LINE});
-       @ARGV = ('bashcomplete', 'pveclient', $ARGV[1], $ARGV[2]);
 
+       if ($cmd eq 'list') { # simple commands
+           $ENV{COMP_LINE} = "pveclient $3";
+           $ENV{COMP_POINT} = length($ENV{COMP_LINE});
+           @ARGV = ('bashcomplete', 'pveclient', $ARGV[1], $ARGV[2]);
+       } else {
+           $ENV{COMP_LINE} = "pveclient $3";
+           $ENV{COMP_POINT} = length($ENV{COMP_LINE});
+           @ARGV = ('bashcomplete', 'pveclient', $ARGV[1], $ARGV[2]);
+       }
        $class->run_cli_handler();
 
     } else {