Add eopkg completion support #4600
Conversation
Add support for eopkg in __fish_print_packages function, and add new completion eopkg.fish in share/completions
share/completions/eopkg.fish
Outdated
| # Eopkg additional completion test | ||
| function __fish_eopkg_package_ok -d 'Test if eopkg should have packages as completion candidate' | ||
| for i in (commandline -poc) | ||
| if contains -- $i upgrade up remove rm install it info check |
There was a problem hiding this comment.
This entire function can be simplified to complete -c eopkg -n '__fish_seen_subcommand_from upgrade up remove rm #...' -a '(__fish_print_packages)'.
share/completions/eopkg.fish
Outdated
|
|
||
| function __fish_eopkg_component_ok -d 'Test if eopkg should have components as posible completion' | ||
| for i in (commandline -poc) | ||
| if contains -- $i -c --component |
There was a problem hiding this comment.
This can also be simplified - just use complete's option options:
complete -c eopkg -s c -l component -a '(__fish_eopkg_print_components)'
share/completions/eopkg.fish
Outdated
|
|
||
| # Eopkg subcommand | ||
| function __fish_eopkg_subcommand | ||
| set subcommand $argv[1] |
There was a problem hiding this comment.
This can also be done via the -a/--argument-names option to function. I.e.
function __fish_eopkg_subcommand -a subcommand
set -e argv[1] # or use `$argv[2..-1]` later
complete -f #...There was a problem hiding this comment.
Note: Using $argv[$x] with $x != 1 is okay since 2.7.0 - before it would print an error if it $argv wasn't long enough.
share/completions/eopkg.fish
Outdated
| complete -f -c eopkg -n '__fish_use_subcommand' -a $shortcut $argv | ||
| end | ||
|
|
||
| function __fish_eopkg_using_subcommand -d 'Test if given subcommand is used' |
There was a problem hiding this comment.
This is almost exactly __fish_seen_subcommand_from.
share/completions/eopkg.fish
Outdated
|
|
||
| # Print additional completion | ||
| function __fish_eopkg_print_components -d "Print list of components" | ||
| eopkg list-components -N | cut -d ' ' -f 1 |
There was a problem hiding this comment.
This cut can be replaced with string replace -r ' .*' '', removing one fork.
share/completions/eopkg.fish
Outdated
| complete -f -c eopkg -n '__fish_eopkg_repo_ok' -a "(__fish_eopkg_print_repos)" -d "repository" | ||
|
|
||
| # Setup eopkg subcommand with shortcut | ||
| __fish_eopkg_subcommand_with_shortcut upgrade up -d "Upgrades eopkg packages" |
There was a problem hiding this comment.
Descriptions should be kept as short as possible - is the eopkg necessary here? That's the tool we're using, I wouldn't expect it to upgrade deb packages or rpms.
share/completions/eopkg.fish
Outdated
|
|
||
| # Setup eopkg subcommand with shortcut | ||
| __fish_eopkg_subcommand_with_shortcut upgrade up -d "Upgrades eopkg packages" | ||
| __fish_eopkg_option_with_shortcut upgrade up -l security-only -d "Security related package upgrades only" |
There was a problem hiding this comment.
Cut the "package" - "Security related upgrades only".
share/completions/eopkg.fish
Outdated
| # Setup eopkg subcommand with shortcut | ||
| __fish_eopkg_subcommand_with_shortcut upgrade up -d "Upgrades eopkg packages" | ||
| __fish_eopkg_option_with_shortcut upgrade up -l security-only -d "Security related package upgrades only" | ||
| __fish_eopkg_option_with_shortcut upgrade up -s n -l dry-run -d "Do not perform any action, just show what would be done" |
There was a problem hiding this comment.
Wow, we have a bunch of different descriptions for dry-run options - grep dry share/completions/*.fish.
I kinda like Show what would be done from the bzr completions, or Display actions without running from fossil.
share/completions/eopkg.fish
Outdated
| __fish_eopkg_option_with_shortcut install it -s c -l component -f -d "Install component's and recursive components' packages" | ||
|
|
||
| __fish_eopkg_subcommand_with_shortcut remove rm -d "Remove eopkg packages" | ||
| __fish_eopkg_option_with_shortcut remove rm -l purge -d "Removes everything including changed config files of the package" |
There was a problem hiding this comment.
You're using the imperative mood elsewhere - "Remove ...". Do that here as well:
"Remove everything including changed config files"? Or "Remove changed config files as well"?
share/completions/eopkg.fish
Outdated
|
|
||
| __fish_eopkg_subcommand_with_shortcut history hs -d "History of eopkg operations" | ||
| __fish_eopkg_option_with_shortcut history hs -s l -l last -x -d "Output only the last n operations" | ||
| __fish_eopkg_option_with_shortcut history hs -s t -l takeback -x -d "Takeback to the state after the given operation finished" |
There was a problem hiding this comment.
"finished" is kinda superfluous here, no? "Takeback to the state after the given operation"?
|
Thank you, @faho! I'll try to implement your review. Completion's description was pulled from |
|
Merged, thanks! |
faho
added
the
release notes
Add support for eopkg in __fish_print_packages function, and
add new completion eopkg.fish in share/completions