mirror of
https://github.com/fish-shell/fish-shell
synced 2025-01-12 13:08:49 +00:00
pacman completion: Turn into regular completion
This used to be a function because we didn't have complete -w Use that and it becomes a bit simpler. This also simplifies the code in a few other ways (like removing a useless-use-of-cat) and adds comments about a few edgecases.
This commit is contained in:
Fabian Homborg
ridiculousfish
parent
e7273e1d81
commit
882f4714ac
6 changed files with 131 additions and 124 deletions
|
|
@ -1,3 +1 @@
|
||||||
|
complete -c pacman-color -w pacman
|
||||||
__fish_complete_pacman pacman-color
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,129 @@
|
||||||
|
# Completions for pacman
|
||||||
|
# Author: Giorgio Lando <patroclo7@gmail.com>
|
||||||
|
# Updated by maxfl, SanskritFritz, faho
|
||||||
|
|
||||||
__fish_complete_pacman pacman
|
set -l progname pacman
|
||||||
|
|
||||||
|
set -l listinstalled "(pacman -Q | tr ' ' \t)"
|
||||||
|
# This might be an issue if another package manager is also installed (e.g. for containers)
|
||||||
|
set -l listall "(__fish_print_packages)"
|
||||||
|
set -l listrepos "(grep '^\[.\+\]' /etc/pacman.conf | sed 's/[]\[]//g')"
|
||||||
|
set -l listgroups "(pacman -Sg | sed 's/\(.*\)/\1\tPackage group/g')"
|
||||||
|
|
||||||
|
set -l noopt '__fish_contains_opt -s S -s D -s Q -s R -s U -s T database query sync remove upgrade deptest'
|
||||||
|
set -l database '__fish_contains_opt -s D database'
|
||||||
|
set -l query '__fish_contains_opt -s Q query'
|
||||||
|
set -l remove '__fish_contains_opt -s R remove'
|
||||||
|
set -l sync '__fish_contains_opt -s S sync'
|
||||||
|
set -l upgrade '__fish_contains_opt -s U upgrade'
|
||||||
|
|
||||||
|
# By default fish expands the arguments with the option which is not desired
|
||||||
|
# due to performance reasons.
|
||||||
|
# This will make sure we are expanding an argument and not an option:
|
||||||
|
set -l argument 'not expr -- (commandline --current-token) : "^-.*" > /dev/null'
|
||||||
|
|
||||||
|
complete -c pacman -e
|
||||||
|
complete -c pacman -f
|
||||||
|
# Primary operations
|
||||||
|
complete -c $progname -s D -f -l database -n $noopt -d 'Modify the package database'
|
||||||
|
complete -c $progname -s Q -f -l query -n $noopt -d 'Query the package database'
|
||||||
|
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 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 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 'Alternate architecture' -f
|
||||||
|
complete -c $progname -l cachedir -d 'Alternative package cache location'
|
||||||
|
complete -c $progname -l config -d 'Alternate config file'
|
||||||
|
complete -c $progname -l debug -d 'Display debug messages' -f
|
||||||
|
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' -f
|
||||||
|
|
||||||
|
# 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' -f
|
||||||
|
complete -c $progname -n $$condition -l dbonly -d 'Modify database entry only' -f
|
||||||
|
complete -c $progname -n $$condition -l noprogressbar -d 'Do not display progress bar' -f
|
||||||
|
complete -c $progname -n $$condition -l noscriptlet -d 'Do not execute install script' -f
|
||||||
|
complete -c $progname -n $$condition -s p -l print -d 'Dry run, only print targets' -f
|
||||||
|
complete -c $progname -n $$condition -l print-format -x -d 'Specify printf-like format' -f
|
||||||
|
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' -f
|
||||||
|
complete -c $progname -n $$condition -l asexplicit -d 'Mark PACKAGE as explicitly installed' -f
|
||||||
|
end
|
||||||
|
|
||||||
|
# Upgrade options (sync, upgrade)
|
||||||
|
for condition in sync upgrade
|
||||||
|
complete -c $progname -n $$condition -l force -d 'Bypass file conflict checks' -f
|
||||||
|
complete -c $progname -n $$condition -l ignore -d 'Ignore upgrade of PACKAGE' -xa "$listinstalled" -f
|
||||||
|
complete -c $progname -n $$condition -l ignoregroup -d 'Ignore upgrade of GROUP' -xa "$listgroups" -f
|
||||||
|
complete -c $progname -n $$condition -l needed -d 'Do not reinstall up-to-date targets' -f
|
||||||
|
complete -c $progname -n $$condition -l recursive -d 'Recursively reinstall all dependencies' -f
|
||||||
|
end
|
||||||
|
|
||||||
|
# Query and sync options
|
||||||
|
for condition in query sync
|
||||||
|
complete -c $progname -n $$condition -s g -l groups -d 'Display all packages in GROUP' -xa "$listgroups" -f
|
||||||
|
complete -c $progname -n $$condition -s i -l info -d 'Display information on PACKAGE' -f
|
||||||
|
complete -c $progname -n $$condition -s q -l quiet -d 'Show less information' -f
|
||||||
|
complete -c $progname -n $$condition -s s -l search -r -d 'Search packages for regexp' -f
|
||||||
|
end
|
||||||
|
|
||||||
|
# Query options
|
||||||
|
complete -c $progname -n $query -s c -l changelog -d 'View the change log of PACKAGE' -f
|
||||||
|
complete -c $progname -n $query -s d -l deps -d 'List only non-explicit packages (dependencies)' -f
|
||||||
|
complete -c $progname -n $query -s e -l explicit -d 'List only explicitly installed packages' -f
|
||||||
|
complete -c $progname -n $query -s k -l check -d 'Check if all files owned by PACKAGE are present' -f
|
||||||
|
complete -c $progname -n $query -s l -l list -d 'List all files owned by PACKAGE' -f
|
||||||
|
complete -c $progname -n $query -s m -l foreign -d 'List all packages not in the database' -f
|
||||||
|
complete -c $progname -n $query -s o -l owns -r -d 'Search for the package that owns FILE' -xa '' -f
|
||||||
|
complete -c $progname -n $query -s p -l file -d 'Apply the query to a package file, not package' -xa '' -f
|
||||||
|
complete -c $progname -n $query -s t -l unrequired -d 'List only unrequired packages' -f
|
||||||
|
complete -c $progname -n $query -s u -l upgrades -d 'List only out-of-date packages' -f
|
||||||
|
complete -c $progname -n "$query; and $argument" -d 'Installed package' -xa $listinstalled -f
|
||||||
|
|
||||||
|
# Remove options
|
||||||
|
complete -c $progname -n $remove -s c -l cascade -d 'Also remove packages depending on PACKAGE' -f
|
||||||
|
complete -c $progname -n $remove -s n -l nosave -d 'Ignore file backup designations' -f
|
||||||
|
complete -c $progname -n $remove -s s -l recursive -d 'Also remove dependencies of PACKAGE' -f
|
||||||
|
complete -c $progname -n $remove -s u -l unneeded -d 'Only remove targets not required by PACKAGE' -f
|
||||||
|
complete -c $progname -n "$remove; and $argument" -d 'Installed package' -xa $listinstalled -f
|
||||||
|
|
||||||
|
# Sync options
|
||||||
|
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; and not __fish_contains_opt -s u sysupgrade" -s u -l sysupgrade -d 'Upgrade all packages that are out of date'
|
||||||
|
complete -c $progname -n "$sync; and __fish_contains_opt -s u sysupgrade" -s u -l sysupgrade -d 'Also downgrade packages'
|
||||||
|
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 fresh copy of the package list'
|
||||||
|
complete -c $progname -n "$argument; and $sync" -xa "$listall $listgroups"
|
||||||
|
|
||||||
|
# Upgrade options
|
||||||
|
# Theoretically, pacman reads packages in all formats that libarchive supports
|
||||||
|
# In practice, it's going to be tar.xz or tar.gz
|
||||||
|
# Using "pkg.tar.*" here would change __fish_complete_suffix's descriptions to "unknown"
|
||||||
|
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'
|
||||||
|
|
||||||
|
set -e progname
|
||||||
|
set -e listinstalled
|
||||||
|
set -e listall
|
||||||
|
set -e listrepos
|
||||||
|
set -e listgroups
|
||||||
|
set -e noopt
|
||||||
|
set -e database
|
||||||
|
set -e query
|
||||||
|
set -e remove
|
||||||
|
set -e sync
|
||||||
|
set -e upgrade
|
||||||
|
set -e argument
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1 @@
|
||||||
|
complete -c pacmatic -w pacman
|
||||||
__fish_complete_pacman pacmatic
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1 @@
|
||||||
|
complete -c pacsrc -w pacman
|
||||||
__fish_complete_pacman pacsrv
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1 @@
|
||||||
|
complete -c yaourt -w pacman
|
||||||
__fish_complete_pacman yaourt
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,112 +0,0 @@
|
||||||
function __fish_complete_pacman -d 'Complete pacman (ARCH package manager)' --argument-names progname
|
|
||||||
# Completions for pacman
|
|
||||||
# Author: Giorgio Lando <patroclo7@gmail.com>
|
|
||||||
# Updated by maxfl, SanskritFritz.
|
|
||||||
|
|
||||||
set -q progname[1]; or set -l progname pacman
|
|
||||||
|
|
||||||
set -l listinstalled "(pacman -Q | tr ' ' \t)"
|
|
||||||
set -l listall "(__fish_print_packages)"
|
|
||||||
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 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.
|
|
||||||
# This will make sure we are expanding an argument and not an option:
|
|
||||||
set -l argument 'not expr -- (commandline --current-token) : "^-.*" > /dev/null'
|
|
||||||
|
|
||||||
# Primary operations
|
|
||||||
complete -c $progname -s D -f -l database -n $noopt -d 'Modify the package database'
|
|
||||||
complete -c $progname -s Q -f -l query -n $noopt -d 'Query the package database'
|
|
||||||
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 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 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 'Alternate architecture'
|
|
||||||
complete -c $progname -l cachedir -d 'Alternative package cache location'
|
|
||||||
complete -c $progname -l config -d 'Alternate config file'
|
|
||||||
complete -c $progname -l debug -d 'Display debug messages'
|
|
||||||
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 (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 progress bar'
|
|
||||||
complete -c $progname -n $$condition -l noscriptlet -d 'Do not execute install script'
|
|
||||||
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 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 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 change log 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 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" -d 'Installed package' -xa $listinstalled
|
|
||||||
|
|
||||||
# Remove options
|
|
||||||
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 '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" -d 'Installed package' -xa $listinstalled
|
|
||||||
|
|
||||||
# Sync options
|
|
||||||
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 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
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue