X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FCLIHandler.pm;h=efc8a1a2bb4ffe67e0a94ac75504378ce0ba2611;hp=e61fa6a1cdf02c601d1850021cc3e94e246ca099;hb=e93833f5248afa93a9a3e7cda1668a5d6d124738;hpb=cb87191ed641152ec111d7940a364d6e68cad8e1 diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm index e61fa6a..efc8a1a 100644 --- a/src/PVE/CLIHandler.pm +++ b/src/PVE/CLIHandler.pm @@ -2,7 +2,6 @@ package PVE::CLIHandler; use strict; use warnings; -use Data::Dumper; use PVE::SafeSyslog; use PVE::Exception qw(raise raise_param_exc); @@ -49,12 +48,12 @@ my $complete_command_names = sub { }; __PACKAGE__->register_method ({ - name => 'help', + name => 'help', path => 'help', method => 'GET', description => "Get help about specified command.", parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { cmd => { description => "Command name", @@ -70,7 +69,7 @@ __PACKAGE__->register_method ({ }, }, returns => { type => 'null' }, - + code => sub { my ($param) = @_; @@ -84,7 +83,7 @@ __PACKAGE__->register_method ({ if (!$cmd) { if ($verbose) { print_usage_verbose(); - } else { + } else { print_usage_short(\*STDOUT); } return undef; @@ -311,7 +310,7 @@ sub verify_api { my $get_exe_name = sub { my ($class) = @_; - + my $name = $class; $name =~ s/^.*:://; $name =~ s/_/-/g; @@ -338,29 +337,6 @@ complete -o default -C '$exename bashcomplete' $exename __EOD__ } -sub find_cli_class_source { - my ($name) = @_; - - my $filename; - - $name =~ s/-/_/g; - - my $cpath = "PVE/CLI/${name}.pm"; - my $spath = "PVE/Service/${name}.pm"; - foreach my $p (@INC) { - foreach my $s (($cpath, $spath)) { - my $testfn = "$p/$s"; - if (-f $testfn) { - $filename = $testfn; - last; - } - } - last if defined($filename); - } - - return $filename; -} - sub generate_asciidoc_synopsys { my ($class) = @_; $class->generate_asciidoc_synopsis(); @@ -472,17 +448,6 @@ my $handle_simple_cmd = sub { &$outsub($res) if $outsub; }; -sub run_cli { - my ($class, $pwcallback, $podfn, $preparefunc) = @_; - - # Note: "depreciated function run_cli - use run_cli_handler instead"; - # silently ignore $podfn , which is no longer supported. - - die "password callback is no longer supported" if $pwcallback; - - run_cli_handler($class, prepare => $preparefunc); -} - sub run_cli_handler { my ($class, %params) = @_;