mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-03 05:35:58 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5989 from szpak-forks/fishCompletion330Fix

Browse source 
Fix command & switch completion in Fish 3.3.0+
This commit is contained in:
TW 2022-01-16 20:29:47 +01:00 committed by GitHub
commit 96e6990bd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/shell_completions/fish/borg.fish
View file

@ -356,7 +356,7 @@ function __fish_borg_is_dir_a_repository
set -l config_content set -l config_content
if test -f $argv[1]/README if test -f $argv[1]/README
and test -f $argv[1]/config and test -f $argv[1]/config
read config_content < $argv[1]/config ^/dev/null read config_content < $argv[1]/config 2>/dev/null
end end
return (string match --quiet '[repository]' $config_content) return (string match --quiet '[repository]' $config_content)
end end
@ -365,7 +365,7 @@ function __fish_borg_list_repos_or_archives
if string match --quiet --regex '.*::' '"'(commandline --current-token)'"' if string match --quiet --regex '.*::' '"'(commandline --current-token)'"'
# If the current token contains "::" then list the archives: # If the current token contains "::" then list the archives:
set -l repository_name (string replace --regex '::.*' '' (commandline --current-token)) set -l repository_name (string replace --regex '::.*' '' (commandline --current-token))
borg list --format="$repository_name::{archive}{TAB}{comment}{NEWLINE}" "$repository_name" ^/dev/null borg list --format="$repository_name::{archive}{TAB}{comment}{NEWLINE}" "$repository_name" 2>/dev/null
else else
# Otherwise list the repositories, directories and user@host entries: # Otherwise list the repositories, directories and user@host entries:
set -l directories (commandline --cut-at-cursor --current-token)*/ set -l directories (commandline --cut-at-cursor --current-token)*/
@ -395,7 +395,7 @@ end
function __fish_borg_list_only_archives function __fish_borg_list_only_archives
set -l repo_matches (string match --regex '([^ ]*)::' (commandline)) set -l repo_matches (string match --regex '([^ ]*)::' (commandline))
borg list --format="{archive}{TAB}{comment}{NEWLINE}" "$repo_matches[2]" ^/dev/null borg list --format="{archive}{TAB}{comment}{NEWLINE}" "$repo_matches[2]" 2>/dev/null
end end
complete -c borg -f -n __fish_borg_is_diff_second_archive -a '(__fish_borg_list_only_archives)' complete -c borg -f -n __fish_borg_is_diff_second_archive -a '(__fish_borg_list_only_archives)'