From: Stefan Reiter <s.reiter@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH common 02/10] PBSClient: allow running other binaries
Date: Wed, 21 Apr 2021 13:15:31 +0200 [thread overview]
Message-ID: <20210421111539.29261-3-s.reiter@proxmox.com> (raw)
In-Reply-To: <20210421111539.29261-1-s.reiter@proxmox.com>
...such as proxmox-file-restore.
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
Fixes indentation where "binary =>" is added.
src/PVE/PBSClient.pm | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm
index f05471c..857cff0 100644
--- a/src/PVE/PBSClient.pm
+++ b/src/PVE/PBSClient.pm
@@ -139,8 +139,9 @@ my sub do_raw_client_cmd {
my $use_crypto = $USE_CRYPT_PARAMS->{$client_cmd};
- my $client_exe = '/usr/bin/proxmox-backup-client';
- die "executable not found '$client_exe'! Proxmox backup client not installed?\n"
+ my $client_exe = (delete $opts{binary}) || 'proxmox-backup-client';
+ $client_exe = "/usr/bin/$client_exe";
+ die "executable not found '$client_exe'! Proxmox backup client or file restore not installed?\n"
if ! -x $client_exe;
my $scfg = $self->{scfg};
@@ -193,22 +194,25 @@ my sub run_raw_client_cmd {
}
my sub run_client_cmd {
- my ($self, $client_cmd, $param, $no_output) = @_;
+ my ($self, $client_cmd, $param, $no_output, $binary) = @_;
my $json_str = '';
my $outfunc = sub { $json_str .= "$_[0]\n" };
+ $binary //= 'proxmox-backup-client';
+
$param = [] if !defined($param);
$param = [ $param ] if !ref($param);
$param = [@$param, '--output-format=json'] if !$no_output;
do_raw_client_cmd(
- $self,
- $client_cmd,
- $param,
- outfunc => $outfunc,
- errmsg => 'proxmox-backup-client failed'
+ $self,
+ $client_cmd,
+ $param,
+ outfunc => $outfunc,
+ errmsg => "$binary failed",
+ binary => $binary,
);
return undef if $no_output;
--
2.20.1
next prev parent reply other threads:[~2021-04-21 11:24 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 11:15 [pve-devel] [PATCH 00/10] Single-file-restore GUI for PBS snapshots Stefan Reiter
2021-04-21 11:15 ` [pve-devel] [PATCH RESEND common 01/10] JSONSchema: don't cycle-check 'download' responses Stefan Reiter
2021-04-21 15:37 ` [pve-devel] applied: " Thomas Lamprecht
2021-04-21 11:15 ` Stefan Reiter [this message]
2021-04-21 14:29 ` [pve-devel] [PATCH common 02/10] PBSClient: allow running other binaries Thomas Lamprecht
2021-04-21 14:38 ` Stefan Reiter
2021-04-21 14:50 ` Thomas Lamprecht
2021-04-21 15:37 ` [pve-devel] applied: " Thomas Lamprecht
2021-04-21 11:15 ` [pve-devel] [PATCH common 03/10] PBSClient: add file_restore_list command Stefan Reiter
[not found] ` <<20210421111539.29261-4-s.reiter@proxmox.com>
2021-04-21 13:19 ` Fabian Grünbichler
2021-04-21 11:15 ` [pve-devel] [PATCH common 04/10] PBSClient: allow different command execution callback Stefan Reiter
[not found] ` <<20210421111539.29261-5-s.reiter@proxmox.com>
2021-04-21 13:19 ` Fabian Grünbichler
2021-04-21 13:39 ` Stefan Reiter
2021-04-21 11:15 ` [pve-devel] [PATCH common 05/10] PBSClient: add file_restore_extract function Stefan Reiter
2021-04-21 11:15 ` [pve-devel] [PATCH RESEND http-server 06/10] allow 'download' to be passed from API handler Stefan Reiter
2021-04-21 15:43 ` [pve-devel] applied: " Thomas Lamprecht
2021-04-21 11:15 ` [pve-devel] [PATCH http-server 07/10] support streaming data form fh to client Stefan Reiter
[not found] ` <<20210421111539.29261-8-s.reiter@proxmox.com>
2021-04-21 13:25 ` Fabian Grünbichler
2021-04-21 11:15 ` [pve-devel] [PATCH http-server 08/10] allow stream download from path and over pvedaemon-proxy Stefan Reiter
2021-04-21 11:15 ` [pve-devel] [PATCH storage 09/10] add FileRestore API for PBS Stefan Reiter
[not found] ` <<20210421111539.29261-10-s.reiter@proxmox.com>
2021-04-21 13:26 ` Fabian Grünbichler
2021-04-21 13:38 ` Stefan Reiter
2021-04-22 6:19 ` Fabian Grünbichler
2021-04-21 11:15 ` [pve-devel] [PATCH manager 10/10] backupview: add file restore button Stefan Reiter
2021-04-22 10:33 ` [pve-devel] [PATCH 00/10] Single-file-restore GUI for PBS snapshots Dominic Jäger
2021-04-22 12:12 ` Stefan Reiter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210421111539.29261-3-s.reiter@proxmox.com \
--to=s.reiter@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox