}});
-sub print_simple_asciidoc_synopsys {
+sub print_simple_asciidoc_synopsis {
my ($class, $name, $arg_param, $uri_param) = @_;
die "not initialized" if !$cli_handler_class;
return $synopsis;
}
-sub print_asciidoc_synopsys {
+sub print_asciidoc_synopsis {
die "not initialized" if !($cmddef && $exename && $cli_handler_class);
sub generate_asciidoc_synopsys {
my ($class) = @_;
+ $class->generate_asciidoc_synopsis();
+};
+
+sub generate_asciidoc_synopsis {
+ my ($class) = @_;
$cli_handler_class = $class;
my $def = ${"${class}::cmddef"};
if (ref($def) eq 'ARRAY') {
- print_simple_asciidoc_synopsys(@$def);
+ print_simple_asciidoc_synopsis(@$def);
} else {
$cmddef = $def;
$cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
- print_asciidoc_synopsys();
+ print_asciidoc_synopsis();
}
}
sub run_cli {
my ($class, $pwcallback, $podfn, $preparefunc) = @_;
- die "depreciated function run_cli - use run_cli_handler instead";
+ # 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 {
foreach my $key (keys %params) {
next if $key eq 'prepare';
next if $key eq 'no_init'; # used by lxc hooks
+ next if $key eq 'no_rpcenv';
die "unknown parameter '$key'";
}
my $preparefunc = $params{prepare};
my $no_init = $params{no_init};
+ my $no_rpcenv = $params{no_rpcenv};
my $pwcallback = $class->can('read_password');
my $stringfilemap = $class->can('string_param_file_mapping');
PVE::INotify::inotify_init() if !$no_init;
+ if (!$no_rpcenv) {
my $rpcenv = PVE::RPCEnvironment->init('cli');
- $rpcenv->init_request() if !$no_init;
- $rpcenv->set_language($ENV{LANG});
- $rpcenv->set_user('root@pam');
+ $rpcenv->init_request() if !$no_init;
+ $rpcenv->set_language($ENV{LANG});
+ $rpcenv->set_user('root@pam');
+ }
}
no strict 'refs';