From 99044151449b61ea7b7f267eb9b7f339b804acdd Mon Sep 17 00:00:00 2001 From: SanskritFritz Date: Tue, 2 Oct 2012 16:21:08 +0200 Subject: [PATCH] Facelift for pacman completions. --- share/functions/__fish_complete_pacman.fish | 80 +++++++++++---------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/share/functions/__fish_complete_pacman.fish b/share/functions/__fish_complete_pacman.fish index ed67bc2ba..70cd65224 100644 --- a/share/functions/__fish_complete_pacman.fish +++ b/share/functions/__fish_complete_pacman.fish @@ -10,11 +10,12 @@ function __fish_complete_pacman -d 'Complete pacman (ARCH package manager)' --ar set -l listrepos "(cat /etc/pacman.conf | grep '^\[.\+\]' | sed 's/[]\[]//g')" set -l listgroups "(pacman -Sg | sed 's/\(.*\)/\1\tPackage group/g')" - set -l noopt 'commandline | not sgrep -qe "-[a-z]*[DQRSTU]\|--database\|--query\|--sync\|--remove\|--upgrade\|--deptest"' - set -l query 'commandline | sgrep -qe "-[a-z]*Q\|--query"' - set -l remove 'commandline | sgrep -qe "-[a-z]*R\|--remove"' - set -l sync 'commandline | sgrep -qe "-[a-z]*S\|--sync"' - set -l upgrade 'commandline | sgrep -qe "-[a-z]*U\|--upgrade"' + set -l noopt 'commandline | not sgrep -qe "-[a-z]*[DQRSTU]\|--database\|--query\|--sync\|--remove\|--upgrade\|--deptest"' + set -l database 'commandline | sgrep -qe "-[a-z]*D\|--database"' + set -l query 'commandline | sgrep -qe "-[a-z]*Q\|--query"' + set -l remove 'commandline | sgrep -qe "-[a-z]*R\|--remove"' + set -l sync 'commandline | sgrep -qe "-[a-z]*S\|--sync"' + set -l upgrade 'commandline | sgrep -qe "-[a-z]*U\|--upgrade"' # By default fish expands the arguments with the option which is not desired # due to performance reasons. @@ -27,82 +28,85 @@ function __fish_complete_pacman -d 'Complete pacman (ARCH package manager)' --ar complete -c $progname -s R -f -l remove -n $noopt -d 'Remove packages from the system' complete -c $progname -s S -f -l sync -n $noopt -d 'Synchronize packages' complete -c $progname -s T -f -l deptest -n $noopt -d 'Check dependencies' - complete -c $progname -s U -f -l upgrade -n $noopt -d 'Upgrade or add a package in the system' + complete -c $progname -s U -f -l upgrade -n $noopt -d 'Upgrade or add a local package' complete -c $progname -s V -f -l version -d 'Display version and exit' complete -c $progname -s h -f -l help -d 'Display help' # General options complete -c $progname -s b -l dbpath -d 'Alternative database location' -xa '(__fish_complete_directories)' - complete -c $progname -s d -d 'Skips all dependency checks' - complete -c $progname -s f -d 'Bypass file conflict checks' - complete -c $progname -s r -l root -d 'Specify an alternative installation root' + complete -c $progname -s r -l root -d 'Alternative installation root' complete -c $progname -s v -l verbose -d 'Output more status messages' - complete -c $progname -l arch -d 'Specify alternate architecture' - complete -c $progname -l cachedir -d 'Specify an alternative package cache location' - complete -c $progname -l config -d 'Specify an altenate config file' + complete -c $progname -l arch -d 'Alternate architecture' + complete -c $progname -l cachedir -d 'Alternative package cache location' + complete -c $progname -l config -d 'Altenate config file' complete -c $progname -l debug -d 'Display debug messages' - complete -c $progname -l gpgdir -d 'Specify a directory of files used by GnuPG to verify package signatures' + complete -c $progname -l gpgdir -d 'GPG directory to verify signatures' complete -c $progname -l logfile -d 'Specify alternative log file' complete -c $progname -l noconfirm -d 'Bypass any question' - # Transaction options (query, sync, remove, upgrade) - for condition in query sync remove upgrade - complete -c $progname -n $$condition -s d -l nodeps -d 'Skip dependency check' - complete -c $progname -n $$condition -l dbonly -d 'Add/remove the database entry only, leave all files' + # Transaction options (sync, remove, upgrade) + for condition in sync remove upgrade + complete -c $progname -n $$condition -s d -l nodeps -d 'Skip [all] dependency checks' + complete -c $progname -n $$condition -l dbonly -d 'Modify database entry only' complete -c $progname -n $$condition -l noprogressbar -d 'Do not display progressbar' complete -c $progname -n $$condition -l noscriptlet -d 'Do not execute intall script' - complete -c $progname -n $$condition -s p -l print -d 'Only print targets instead of performing the actual operation' + complete -c $progname -n $$condition -s p -l print -d 'Dry run, only print targets' complete -c $progname -n $$condition -l print-format -x -d 'Specify printf-like format' end + # Database and upgrade options (database, sync, upgrade) + for condition in database sync upgrade + complete -c $progname -n $$condition -l asdeps -d 'Mark PACKAGE as dependency' + complete -c $progname -n $$condition -l asexplicit -d 'Mark PACKAGE as explicitly installed' + end + # Upgrade options (sync, upgrade) for condition in sync upgrade complete -c $progname -n $$condition -s f -l force -d 'Bypass file conflict checks' - complete -c $progname -n $$condition -l asdeps -d 'Install packages non-explicitly, as dependencies' - complete -c $progname -n $$condition -l asexplicit -d 'Install packages explicitly' - complete -c $progname -n $$condition -l ignore -d 'Ignore upgrade of this package' -xa $listinstalled - complete -c $progname -n $$condition -l ignoregroup -d 'Ignore upgrade of all packages in a group' -xa $listgroups + complete -c $progname -n $$condition -l ignore -d 'Ignore upgrade of PACKAGE' -xa "$listinstalled" + complete -c $progname -n $$condition -l ignoregroup -d 'Ignore upgrade of GROUP' -xa "$listgroups" complete -c $progname -n $$condition -l needed -d 'Do not reinstall up-to-date targets' complete -c $progname -n $$condition -l recursive -d 'Recursively reinstall all dependencies' end # Query and sync options for condition in query sync - complete -c $progname -n $$condition -s g -l groups -d 'Display all packages in the group' - complete -c $progname -n $$condition -s i -l info -d 'Display information on a given package' + complete -c $progname -n $$condition -s g -l groups -d 'Display all packages in GROUP' -xa "$listgroups" + complete -c $progname -n $$condition -s i -l info -d 'Display information on PACKAGE' complete -c $progname -n $$condition -s q -l quiet -d 'Show less information' complete -c $progname -n $$condition -s s -l search -r -d 'Search packages for regexp' end # Query options - complete -c $progname -n $query -s c -l changelog -d 'View the changelog of a package' + complete -c $progname -n $query -s c -l changelog -d 'View the changelog of PACKAGE' complete -c $progname -n $query -s d -l deps -d 'List only non-explicit packages (dependencies)' complete -c $progname -n $query -s e -l explicit -d 'List only explicitly installed packages' - complete -c $progname -n $query -s k -l check -d 'Check that all files owned by the package are present' - complete -c $progname -n $query -s l -l list -d 'List all files owned by a given package' - complete -c $progname -n $query -s m -l foreign -d 'List all packages which are not in the sync database' - complete -c $progname -n $query -s o -l owns -r -d 'Search for the package that owns file' - complete -c $progname -n $query -s p -l file -d 'Apply the query to a package file and not to an installed package' - complete -c $progname -n $query -s t -l unrequired -d 'List packages not required by any of installed packages' - complete -c $progname -n $query -s u -l upgrades -d 'List all out of date packages in the system' + complete -c $progname -n $query -s k -l check -d 'Check if all files owned by PACKAGE are present' + complete -c $progname -n $query -s l -l list -d 'List all files owned by PACKAGE' + complete -c $progname -n $query -s m -l foreign -d 'List all packages not in the database' + complete -c $progname -n $query -s o -l owns -r -d 'Search for the package that owns FILE' -xa '' + complete -c $progname -n $query -s p -l file -d 'Apply the query to a package file, not package' -xa '' + complete -c $progname -n $query -s t -l unrequired -d 'List only unrequired packages' + complete -c $progname -n $query -s u -l upgrades -d 'List only out-of-date packages' complete -c $progname -n "$query; and $argument" -xa $listinstalled -d 'Installed package' # Remove options - complete -c $progname -n $remove -s c -l cascade -d 'Remove also the packages that depends on the target packages' + complete -c $progname -n $remove -s c -l cascade -d 'Also remove packages depending on PACKAGE' complete -c $progname -n $remove -s n -l nosave -d 'Ignore file backup designations' - complete -c $progname -n $remove -s s -l recursive -d 'Remove also the dependencies of the target packages' - complete -c $progname -n $remove -s u -l unneeded -d 'Remove targets that are not required by any other package' + complete -c $progname -n $remove -s s -l recursive -d 'Also remove dependencies of PACKAGE' + complete -c $progname -n $remove -s u -l unneeded -d 'Only remove targets not required by PACKAGE' complete -c $progname -n "$remove; and $argument" -xa $listinstalled -d 'Installed package' # Sync options - complete -c $progname -n $sync -s c -l clean -d 'Remove old packages from the cache; if iterated, remove all' - complete -c $progname -n $sync -s l -l list -xa "$listrepos" -d 'List all packages in the repository' + complete -c $progname -n $sync -s c -l clean -d 'Remove [all] packages from cache' + complete -c $progname -n $sync -s l -l list -xa "$listrepos" -d 'List all packages in REPOSITORY' complete -c $progname -n $sync -s u -l sysupgrade -d 'Upgrade all packages that are out of date' complete -c $progname -n $sync -s w -l downloadonly -d 'Only download the target packages' - complete -c $progname -n $sync -s y -l refresh -d 'Download a fresh copy of the master package list' + complete -c $progname -n $sync -s y -l refresh -d 'Download fresh copy of the package list' complete -c $progname -n "$argument; and $sync" -xa "$listall $listgroups" # Upgrade options complete -c $progname -n "$upgrade; and $argument" -xa '(__fish_complete_suffix pkg.tar.xz)' -d 'Package file' complete -c $progname -n "$upgrade; and $argument" -xa '(__fish_complete_suffix pkg.tar.gz)' -d 'Package file' end +