psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make more precise, fix the version check fn

Browse source
This commit is contained in:
Isaac 2023-04-27 19:58:22 -07:00
parent 5678f3a96e
commit 25b3db72a0
No known key found for this signature in database
GPG key ID: E69FB5A841448A48
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
borgmatic/commands/completion.py
View file

@ -64,25 +64,29 @@ def fish_completion():
borgmatic's command-line argument parsers. borgmatic's command-line argument parsers.
''' '''
top_level_parser, subparsers = arguments.make_parsers() top_level_parser, subparsers = arguments.make_parsers()
global_flags = parser_flags(top_level_parser)
actions = ' '.join(subparsers.choices.keys()) actions = ' '.join(subparsers.choices.keys())
# Avert your eyes. # Avert your eyes.
return '\n'.join( return '\n'.join(
( (
'function __borgmatic_check_version', 'function __borgmatic_check_version',
' set this_script (status current-filename)', ' set this_script (cat (status current-filename) 2> /dev/null)',
' set installed_script (borgmatic --fish-completion 2> /dev/null)', ' set installed_script (borgmatic --fish-completion 2> /dev/null)',
' if [ "$this_script" != "$installed_script" ] && [ "$installed_script" != "" ]', ' if [ "$this_script" != "$installed_script" ] && [ "$installed_script" != "" ]',
' echo "{}"'.format(upgrade_message('fish', 'borgmatic --fish-completion | sudo tee (status current-filename)', '(status current-filename)')), ' echo "{}"'.format(upgrade_message('fish', 'borgmatic --fish-completion | sudo tee (status current-filename)', '(status current-filename)')),
' end', ' end',
'end', 'end',
'__borgmatic_check_version &',
) + tuple( ) + tuple(
'''complete -c borgmatic -n '__borgmatic_check_version' -a '%s' -d %s -f''' '''complete -c borgmatic -a '%s' -d %s -f'''
% (action, shlex.quote(subparser.description)) % (action, shlex.quote(subparser.description))
for action, subparser in subparsers.choices.items() for action, subparser in subparsers.choices.items()
) + ( ) + (
'complete -c borgmatic -a "%s" -d "borgmatic actions" -f' % actions, 'complete -c borgmatic -a "%s" -d "borgmatic actions" -f' % actions,
'complete -c borgmatic -a "%s" -d "borgmatic global flags" -f' % global_flags, ) + tuple(
'''complete -c borgmatic -a '%s' -d %s -f'''
% (option, shlex.quote(action.help))
for action in top_level_parser._actions
for option in action.option_strings
) )
) )