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

make upgrade message a template

Browse source
This commit is contained in:
Isaac 2023-04-27 19:31:42 -07:00
parent 0009471f67
commit 28b152aedd
No known key found for this signature in database
GPG key ID: E69FB5A841448A48
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
borgmatic/commands/completion.py
View file

@ -1,12 +1,13 @@
from borgmatic.commands import arguments from borgmatic.commands import arguments
UPGRADE_MESSAGE = ''' def upgrade_message(language: str, upgrade_command: str, completion_file: str):
Your bash completions script is from a different version of borgmatic than is return f'''
Your {language} completions script is from a different version of borgmatic than is
currently installed. Please upgrade your script so your completions match the currently installed. Please upgrade your script so your completions match the
command-line flags in your installed borgmatic! Try this to upgrade: command-line flags in your installed borgmatic! Try this to upgrade:
sudo sh -c "borgmatic --bash-completion > $BASH_SOURCE" {upgrade_command}
source $BASH_SOURCE source {completion_file}
''' '''
@ -34,7 +35,7 @@ def bash_completion():
' local this_script="$(cat "$BASH_SOURCE" 2> /dev/null)"', ' local this_script="$(cat "$BASH_SOURCE" 2> /dev/null)"',
' local installed_script="$(borgmatic --bash-completion 2> /dev/null)"', ' local installed_script="$(borgmatic --bash-completion 2> /dev/null)"',
' if [ "$this_script" != "$installed_script" ] && [ "$installed_script" != "" ];' ' if [ "$this_script" != "$installed_script" ] && [ "$installed_script" != "" ];'
f' then cat << EOF\n{UPGRADE_MESSAGE}\nEOF', ' then cat << EOF\n{}\nEOF'.format(upgrade_message('bash', 'sudo sh -c "borgmatic --bash-completion > $BASH_SOURCE"', '$BASH_SOURCE')),
' fi', ' fi',
'}', '}',
'complete_borgmatic() {', 'complete_borgmatic() {',
@ -69,11 +70,11 @@ def fish_completion():
return '\n'.join( return '\n'.join(
( (
'function __borgmatic_check_version', 'function __borgmatic_check_version',
' set this_script (cat "$BASH_SOURCE" 2> /dev/null)', ' set this_script (status current-filename)',
' set installed_script (borgmatic --bash-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" != "" ]',
f' echo "{UPGRADE_MESSAGE}"', ' echo "{}"'.format(upgrade_message('fish', 'borgmatic --fish-completion | sudo tee (status current-filename)', '(status current-filename)')),
' end', ' end',
'end', 'end',
'function __borgmatic_complete', # 'function __borgmatic_complete',
)) ))