From d24a14744c2302cd9d0451514241d8b7b0356349 Mon Sep 17 00:00:00 2001 From: Shun Sakai Date: Mon, 6 Jul 2020 08:22:36 +0900 Subject: [PATCH] Update apk-tools completions (#7171) * Update apk-tools completions Add completions of options of it's subcommands. The completions of deprecated options is unimplemented. * Fix installed package listing for apk-tools An error occurs when the local cache does not exist, so fixed this. --- share/completions/apk.fish | 106 ++++++++++++++++++++- share/functions/__fish_print_packages.fish | 2 +- 2 files changed, 105 insertions(+), 3 deletions(-) diff --git a/share/completions/apk.fish b/share/completions/apk.fish index 5208fb8e7..51fa65563 100644 --- a/share/completions/apk.fish +++ b/share/completions/apk.fish @@ -6,8 +6,8 @@ complete -f -c apk -n "__fish_seen_subcommand_from del fix version manifest" -a # Global options complete -f -c apk -s h -l help -d "Show help" -complete -f -c apk -s p -l root -d "Install packages to DIR" -complete -f -c apk -s X -l repository -d "Use packages from REPO" +complete -x -c apk -s p -l root -d "Install packages to DIR" +complete -x -c apk -s X -l repository -d "Use packages from REPO" complete -f -c apk -s q -l quiet -d "Print less information" complete -f -c apk -s v -l verbose -d "Print more information" complete -f -c apk -s i -l interactive -d "Ask confirmation for certain operations" @@ -53,3 +53,105 @@ complete -f -c apk -n __fish_use_subcommand -a dot -d "Generate graphviz graphs" complete -f -c apk -n __fish_use_subcommand -a policy -d "Show repository policy for packages" complete -f -c apk -n __fish_use_subcommand -a stats -d "Show statistics about repositories and installations" complete -f -c apk -n __fish_use_subcommand -a manifest -d "Show checksums of package contents" + +# Commit options +complete -f -c apk -n "__fish_seen_subcommand_from add del fix upgrade" -s s -l simulate -d "Simulate the requested operation" +complete -f -c apk -n "__fish_seen_subcommand_from add del fix upgrade" -l clean-protected -d "Don't create .apk-new files" +complete -f -c apk -n "__fish_seen_subcommand_from add del fix upgrade" -l overlay-from-stdin -d "Read list of overlay files from stdin" +complete -f -c apk -n "__fish_seen_subcommand_from add del fix upgrade" -l no-scripts -d "Don't execute any scripts" +complete -f -c apk -n "__fish_seen_subcommand_from add del fix upgrade" -l no-commit-hooks -d "Skip pre/post hook scripts" +complete -f -c apk -n "__fish_seen_subcommand_from add del fix upgrade" -l initramfs-diskless-boot -d "Enables options for diskless initramfs boot" + +# Add options +complete -f -c apk -n "__fish_seen_subcommand_from add" -l initdb -d "Initialize database" +complete -f -c apk -n "__fish_seen_subcommand_from add" -s u -l upgrade -d "Prefer to upgrade package" +complete -f -c apk -n "__fish_seen_subcommand_from add" -s l -l latest -d "Select latest version of package" +complete -x -c apk -n "__fish_seen_subcommand_from add" -s t -l virtual -d "Create virtual package" +complete -f -c apk -n "__fish_seen_subcommand_from add" -l no-chown -d "Don't change file owner or group" + +# Delete options +complete -f -c apk -n "__fish_seen_subcommand_from del" -s r -l rdepends -d "Remove unneeded dependencies too" + +# Fix options +complete -f -c apk -n "__fish_seen_subcommand_from fix" -s d -l depends -d "Fix all dependencies too" +complete -f -c apk -n "__fish_seen_subcommand_from fix" -s r -l reinstall -d "Reinstall the package" +complete -f -c apk -n "__fish_seen_subcommand_from fix" -s u -l upgrade -d "Prefer to upgrade package" +complete -f -c apk -n "__fish_seen_subcommand_from fix" -s x -l xattr -d "Fix packages with broken xattrs" +complete -f -c apk -n "__fish_seen_subcommand_from fix" -l directory-permissions -d "Reset all directory permissions" + +# Info options +complete -f -c apk -n "__fish_seen_subcommand_from info" -s L -l contents -d "List included files" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s e -l installed -d "Check PACKAGE installed status" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s W -l who-owns -d "Print who owns the file" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s R -l depends -d "List the dependencies" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s P -l provides -d "List virtual packages provided" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s r -l rdepends -d "List reverse dependencies" +complete -f -c apk -n "__fish_seen_subcommand_from info" -l replaces -d "List packages that PACKAGE might replace" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s i -l install-if -d "List install_if rule" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s I -l rinstall-if -d "List packages having install_if referencing PACKAGE" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s w -l webpage -d "Print the URL for the upstream" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s s -l size -d "Show installed size" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s d -l description -d "Print the description" +complete -f -c apk -n "__fish_seen_subcommand_from info" -l license -d "Print the license" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s t -l triggers -d "Print active triggers" +complete -f -c apk -n "__fish_seen_subcommand_from info" -s a -l all -d "Print all information" + +# List options +complete -f -c apk -n "__fish_seen_subcommand_from list" -s I -l installed -d "List installed packages only" +complete -f -c apk -n "__fish_seen_subcommand_from list" -s O -l orphaned -d "List orphaned packages only" +complete -f -c apk -n "__fish_seen_subcommand_from list" -s a -l available -d "List available packages only" +complete -f -c apk -n "__fish_seen_subcommand_from list" -s u -l upgradable -d "List upgradable packages only" +complete -f -c apk -n "__fish_seen_subcommand_from list" -s o -l origin -d "List packages by origin" +complete -f -c apk -n "__fish_seen_subcommand_from list" -s d -l depends -d "List packages by dependency" +complete -f -c apk -n "__fish_seen_subcommand_from list" -s P -l providers -d "List packages by provider" + +# Search options +complete -f -c apk -n "__fish_seen_subcommand_from search" -s a -l all -d "Show all package versions" +complete -f -c apk -n "__fish_seen_subcommand_from search" -s d -l description -d "Search package descriptions" +complete -f -c apk -n "__fish_seen_subcommand_from search" -s x -l exact -d "Require exact match" +complete -f -c apk -n "__fish_seen_subcommand_from search" -s o -l origin -d "Print origin package name" +complete -f -c apk -n "__fish_seen_subcommand_from search" -s r -l rdepends -d "Print reverse dependencies" +complete -f -c apk -n "__fish_seen_subcommand_from search" -l has-origin -d "List packages that have the given origin" + +# Upgrade options +complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -s a -l available -d "Reset all packages to the provided versions" +complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -s l -l latest -d "Select latest version of package" +complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -l no-self-upgrade -d "Don't do early upgrade of the apk" +complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -l self-upgrade-only -d "Only do self-upgrade" +complete -f -c apk -n "__fish_seen_subcommand_from upgrade" -l ignore -d "Ignore the upgrade of PACKAGE" + +# Cache options +complete -f -c apk -n "__fish_seen_subcommand_from cache" -s u -l upgrade -d "Prefer to upgrade package" +complete -f -c apk -n "__fish_seen_subcommand_from cache" -s l -l latest -d "Select latest version of package" + +# Version options +complete -f -c apk -n "__fish_seen_subcommand_from version" -s I -l indexes -d "Print description and versions of indexes" +complete -f -c apk -n "__fish_seen_subcommand_from version" -s t -l test -d "Compare two given versions" +complete -f -c apk -n "__fish_seen_subcommand_from version" -s c -l check -d "Check the given version strings" +complete -f -c apk -n "__fish_seen_subcommand_from version" -s a -l all -d "Consider packages from all repository tags" +complete -x -c apk -n "__fish_seen_subcommand_from version" -s l -l limit -d "Limit to packages with output matching given operand" + +# Index options +complete -x -c apk -n "__fish_seen_subcommand_from index" -s o -l output -d "Write the generated index to FILE" +complete -x -c apk -n "__fish_seen_subcommand_from index" -s x -l index -d "Read an existing index from INDEX" +complete -x -c apk -n "__fish_seen_subcommand_from index" -s d -l description -d "Add a description to the index" +complete -x -c apk -n "__fish_seen_subcommand_from index" -l rewrite-arch -d "Use ARCH as architecture for all packages" +complete -f -c apk -n "__fish_seen_subcommand_from index" -l no-warnings -d "Disable the warning about missing dependencies" + +# Fetch options +complete -f -c apk -n "__fish_seen_subcommand_from fetch" -s L -l link -d "Create hard links" +complete -f -c apk -n "__fish_seen_subcommand_from fetch" -s R -l recursive -d "Fetch all dependencies too" +complete -f -c apk -n "__fish_seen_subcommand_from fetch" -l simulate -d "Simulate the requested operation" +complete -f -c apk -n "__fish_seen_subcommand_from fetch" -s s -l stdout -d "Dump the .apk to stdout" +complete -x -c apk -n "__fish_seen_subcommand_from fetch" -s o -l output -d "Write the downloaded files to DIR" + +# Audit options +complete -f -c apk -n "__fish_seen_subcommand_from audit" -l backup -d "Audit configuration files only" +complete -f -c apk -n "__fish_seen_subcommand_from audit" -l system -d "Audit all system files" +complete -f -c apk -n "__fish_seen_subcommand_from audit" -l check-permissions -d "Check file permissions too" +complete -f -c apk -n "__fish_seen_subcommand_from audit" -s r -l recursive -d "Descend into directories and audit them as well" +complete -f -c apk -n "__fish_seen_subcommand_from audit" -l packages -d "List only the changed packages" + +# Dot options +complete -f -c apk -n "__fish_seen_subcommand_from dot" -l errors -d "Consider only packages with errors" +complete -f -c apk -n "__fish_seen_subcommand_from dot" -l installed -d "Consider only installed packages" diff --git a/share/functions/__fish_print_packages.fish b/share/functions/__fish_print_packages.fish index 63deab800..0dbaa19ab 100644 --- a/share/functions/__fish_print_packages.fish +++ b/share/functions/__fish_print_packages.fish @@ -234,7 +234,7 @@ function __fish_print_packages if type -q -f apk if set -q only_installed - apk info + apk info -q return else apk search -q