mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix command completion in Fish 3.3.0+ 

Fish 3.3.0 enabled stderr-nocaret flag by default which breaks
stderr redirection with "^/dev/null". A posix-like "2>/dev/null"
has to be used instead.

https://github.com/fish-shell/fish-shell/pull/7907
https://github.com/fish-shell/fish-shell/issues/7105
This commit is contained in:
Marcin Zajączkowski 2021-09-16 20:21:29 +02:00
parent 4f82550773
commit 2b67c9f3ee
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

@ -351,7 +351,7 @@ function __fish_borg_is_dir_a_repository
set -l config_content
if test -f $argv[1]/README
and test -f $argv[1]/config
read config_content < $argv[1]/config ^/dev/null
read config_content < $argv[1]/config 2>/dev/null
end
return (string match --quiet '[repository]' $config_content)
end
@ -360,7 +360,7 @@ function __fish_borg_list_repos_or_archives
if string match --quiet --regex '.*::' '"'(commandline --current-token)'"'
# If the current token contains "::" then list the archives:
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
# Otherwise list the repositories, directories and user@host entries:
set -l directories (commandline --cut-at-cursor --current-token)*/
@ -390,7 +390,7 @@ end
function __fish_borg_list_only_archives
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
complete -c borg -f -n __fish_borg_is_diff_second_archive -a '(__fish_borg_list_only_archives)'