From bff110308b62e47a63dd2cd0deeadbc1ecc15436 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 13 Mar 2019 07:23:59 +0100 Subject: [PATCH] src/bin/proxmox-backup-client.rs: fix BACKUPSPEC_REGEX - correctly specify non-capture group And improve bash completion. --- src/bin/proxmox-backup-client.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index 99deb745..eba018aa 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -25,7 +25,7 @@ use regex::Regex; use lazy_static::lazy_static; lazy_static! { - static ref BACKUPSPEC_REGEX: Regex = Regex::new(r"^([a-zA-Z0-9_-]+\.(:?catar|raw)):(.+)$").unwrap(); + static ref BACKUPSPEC_REGEX: Regex = Regex::new(r"^([a-zA-Z0-9_-]+\.(?:catar|raw)):(.+)$").unwrap(); } fn backup_directory>( @@ -385,7 +385,11 @@ pub fn complete_backup_source(arg: &str, param: &HashMap) -> Vec let data: Vec<&str> = arg.splitn(2, ':').collect(); - if data.len() != 2 { return result; } + if data.len() != 2 { + result.push(String::from("root.catar:/")); + result.push(String::from("etc.catar:/etc")); + return result; + } let files = tools::complete_file_name(data[1], param);