Merge pull request #106 from Jguer/print

Basic new Print option implementation
This commit is contained in:
J Guerreiro 2018-01-21 08:05:02 +09:00 committed by GitHub
commit 69c8bf37c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 464 additions and 449 deletions

View file

@ -90,8 +90,8 @@ _yay() {
_pacman_pkg Qq;; _pacman_pkg Qq;;
S) S)
{ _arch_incomp 'g groups' && _pacman_pkg Sg; } || { _arch_incomp 'g groups' && _pacman_pkg Sg; } ||
{ _arch_incomp 'l list' && _arch_compgen "$(yay --complete | \sort -u)"; } || { _arch_incomp 'l list' && _arch_compgen "$(yay -Pc | \sort -u)"; } ||
_arch_compgen "$(yay --complete )";; _arch_compgen "$(yay -Pc )";;
U) U)
_pacman_file;; _pacman_file;;
esac esac

77
cmd.go
View file

@ -5,13 +5,11 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"io"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"time"
) )
var cmdArgs = makeArguments() var cmdArgs = makeArguments()
@ -291,6 +289,8 @@ func handleCmd() (changedConfig bool, err error) {
passToPacman(cmdArgs) passToPacman(cmdArgs)
case "G", "getpkgbuild": case "G", "getpkgbuild":
err = handleGetpkgbuild() err = handleGetpkgbuild()
case "P", "print":
err = handlePrint()
case "Y", "--yay": case "Y", "--yay":
err = handleYay() err = handleYay()
default: default:
@ -314,9 +314,6 @@ func handleConfig(option string) (changedConfig bool) {
config.CleanAfter = true config.CleanAfter = true
case "noafterclean": case "noafterclean":
config.CleanAfter = false config.CleanAfter = false
// case "printconfig":
// fmt.Printf("%#v", config)
// os.Exit(0)
// case "gendb": // case "gendb":
// err = createDevelDB() // err = createDevelDB()
// if err != nil { // if err != nil {
@ -339,14 +336,6 @@ func handleConfig(option string) (changedConfig bool) {
config.SortMode = TopDown config.SortMode = TopDown
case "--bottomup": case "--bottomup":
config.SortMode = BottomUp config.SortMode = BottomUp
// case "complete":
// config.Shell = "sh"
// complete()
// os.Exit(0)
// case "fcomplete":
// config.Shell = fishShell
// complete()
// os.Exit(0)
// case "help": // case "help":
// usage() // usage()
// os.Exit(0) // os.Exit(0)
@ -367,12 +356,32 @@ func handleVersion() {
fmt.Printf("yay v%s\n", version) fmt.Printf("yay v%s\n", version)
} }
func handlePrint() (err error) {
switch {
case cmdArgs.existsArg("d", "defaultconfig"):
fmt.Printf("%#v", config)
case cmdArgs.existsArg("n", "numberupgrades"):
case cmdArgs.existsArg("u", "upgrades"):
case cmdArgs.existsArg("c", "complete"):
switch {
case cmdArgs.existsArg("f", "fish"):
complete("fish")
default:
complete("sh")
}
case cmdArgs.existsArg("s", "stats"):
err = localStatistics()
default:
return nil
}
return nil
}
func handleYay() (err error) { func handleYay() (err error) {
//_, options, targets := cmdArgs.formatArgs() //_, options, targets := cmdArgs.formatArgs()
if cmdArgs.existsArg("h", "help") { if cmdArgs.existsArg("h", "help") {
usage() usage()
} else if cmdArgs.existsArg("printconfig") {
fmt.Printf("%#v", config)
} else if cmdArgs.existsArg("gendb") { } else if cmdArgs.existsArg("gendb") {
err = createDevelDB() err = createDevelDB()
if err != nil { if err != nil {
@ -382,14 +391,6 @@ func handleYay() (err error) {
if err != nil { if err != nil {
return return
} }
} else if cmdArgs.existsArg("complete") {
config.Shell = "sh"
complete()
} else if cmdArgs.existsArg("fcomplete") {
config.Shell = "fish"
complete()
} else if cmdArgs.existsArg("stats") {
err = localStatistics()
} else if cmdArgs.existsArg("cleandeps") { } else if cmdArgs.existsArg("cleandeps") {
err = cleanDependencies() err = cleanDependencies()
} else if len(cmdArgs.targets) > 0 { } else if len(cmdArgs.targets) > 0 {
@ -634,36 +635,6 @@ func numberMenu(pkgS []string, flags []string) (err error) {
return err return err
} }
// Complete provides completion info for shells
func complete() error {
path := completionFile + config.Shell + ".cache"
info, err := os.Stat(path)
if os.IsNotExist(err) || time.Since(info.ModTime()).Hours() > 48 {
os.MkdirAll(filepath.Dir(completionFile), 0755)
out, errf := os.Create(path)
if errf != nil {
return errf
}
if createAURList(out) != nil {
defer os.Remove(path)
}
erra := createRepoList(out)
out.Close()
return erra
}
in, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0644)
if err != nil {
return err
}
defer in.Close()
_, err = io.Copy(os.Stdout, in)
return err
}
// passToPacman outsorces execution to pacman binary without modifications. // passToPacman outsorces execution to pacman binary without modifications.
func passToPacman(args *arguments) error { func passToPacman(args *arguments) error {
var cmd *exec.Cmd var cmd *exec.Cmd

View file

@ -3,16 +3,17 @@ package main
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"io"
"net/http" "net/http"
"os" "os"
"path/filepath"
"time"
alpm "github.com/jguer/go-alpm" alpm "github.com/jguer/go-alpm"
) )
const fishShell = "fish"
//CreateAURList creates a new completion file //CreateAURList creates a new completion file
func createAURList(out *os.File) (err error) { func createAURList(out *os.File, shell string) (err error) {
resp, err := http.Get("https://aur.archlinux.org/packages.gz") resp, err := http.Get("https://aur.archlinux.org/packages.gz")
if err != nil { if err != nil {
return err return err
@ -25,7 +26,7 @@ func createAURList(out *os.File) (err error) {
for scanner.Scan() { for scanner.Scan() {
fmt.Print(scanner.Text()) fmt.Print(scanner.Text())
out.WriteString(scanner.Text()) out.WriteString(scanner.Text())
if config.Shell == fishShell { if shell == "fish" {
fmt.Print("\tAUR\n") fmt.Print("\tAUR\n")
out.WriteString("\tAUR\n") out.WriteString("\tAUR\n")
} else { } else {
@ -38,7 +39,7 @@ func createAURList(out *os.File) (err error) {
} }
//CreatePackageList appends Repo packages to completion cache //CreatePackageList appends Repo packages to completion cache
func createRepoList(out *os.File) (err error) { func createRepoList(out *os.File, shell string) (err error) {
dbList, err := alpmHandle.SyncDbs() dbList, err := alpmHandle.SyncDbs()
if err != nil { if err != nil {
return return
@ -48,7 +49,7 @@ func createRepoList(out *os.File) (err error) {
_ = db.PkgCache().ForEach(func(pkg alpm.Package) error { _ = db.PkgCache().ForEach(func(pkg alpm.Package) error {
fmt.Print(pkg.Name()) fmt.Print(pkg.Name())
out.WriteString(pkg.Name()) out.WriteString(pkg.Name())
if config.Shell == fishShell { if shell == "fish" {
fmt.Print("\t" + pkg.DB().Name() + "\n") fmt.Print("\t" + pkg.DB().Name() + "\n")
out.WriteString("\t" + pkg.DB().Name() + "\n") out.WriteString("\t" + pkg.DB().Name() + "\n")
} else { } else {
@ -61,3 +62,40 @@ func createRepoList(out *os.File) (err error) {
}) })
return nil return nil
} }
// Complete provides completion info for shells
func complete(shell string) error {
var path string
if shell == "fish" {
path = completionFile + "fish" + ".cache"
} else {
path = completionFile + "sh" + ".cache"
}
info, err := os.Stat(path)
if os.IsNotExist(err) || time.Since(info.ModTime()).Hours() > 48 {
os.MkdirAll(filepath.Dir(completionFile), 0755)
out, errf := os.Create(path)
if errf != nil {
return errf
}
if createAURList(out, shell) != nil {
defer os.Remove(path)
}
erra := createRepoList(out, shell)
out.Close()
return erra
}
in, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0644)
if err != nil {
return err
}
defer in.Close()
_, err = io.Copy(os.Stdout, in)
return err
}

View file

@ -28,7 +28,6 @@ type Configuration struct {
BuildDir string `json:"buildDir"` BuildDir string `json:"buildDir"`
Editor string `json:"editor"` Editor string `json:"editor"`
MakepkgBin string `json:"makepkgbin"` MakepkgBin string `json:"makepkgbin"`
Shell string `json:"-"`
PacmanBin string `json:"pacmanbin"` PacmanBin string `json:"pacmanbin"`
PacmanConf string `json:"pacmanconf"` PacmanConf string `json:"pacmanconf"`
TarBin string `json:"tarbin"` TarBin string `json:"tarbin"`

View file

@ -145,6 +145,8 @@ func (parser *arguments) needRoot() bool {
//yay specific //yay specific
case "Y", "yay": case "Y", "yay":
return false return false
case "P", "print":
return false
case "G", "getpkgbuild": case "G", "getpkgbuild":
return false return false
default: default:
@ -328,6 +330,8 @@ func isOp(op string) bool {
//yay specific //yay specific
case "Y", "yay": case "Y", "yay":
return true return true
case "P", "print":
return true
case "G", "getpkgbuild": case "G", "getpkgbuild":
return true return true
default: default:

View file

@ -5,18 +5,20 @@ set -l progname yay
set -l listinstalled "(pacman -Q | string replace ' ' \t)" set -l listinstalled "(pacman -Q | string replace ' ' \t)"
# This might be an issue if another package manager is also installed (e.g. for containers) # This might be an issue if another package manager is also installed (e.g. for containers)
set -l listall "(yay --fcomplete)" set -l listall "(yay -Pcf)"
set -l listrepos "(__fish_print_pacman_repos)" set -l listrepos "(__fish_print_pacman_repos)"
set -l listgroups "(pacman -Sg)\t'Package Group'" set -l listgroups "(pacman -Sg)\t'Package Group'"
set -l listpacman "(__fish_print_packages)" set -l listpacman "(__fish_print_packages)"
set -l noopt 'not __fish_contains_opt -s S -s D -s Q -s R -s U -s T -s F database query sync remove upgrade deptest files' set -l noopt 'not __fish_contains_opt -s S -s D -s Q -s R -s U -s T -s F database query sync remove upgrade deptest files'
set -l database '__fish_contains_opt -s D database' set -l database '__fish_contains_opt -s D database'
set -l getpkgbuild '__fish_contains_opt -s G getpkgbuild' set -l getpkgbuild '__fish_contains_opt -s G getpkgbuild'
set -l print '__fish_contains_opt -s P print'
set -l query '__fish_contains_opt -s Q query' set -l query '__fish_contains_opt -s Q query'
set -l remove '__fish_contains_opt -s R remove' set -l remove '__fish_contains_opt -s R remove'
set -l sync '__fish_contains_opt -s S sync' set -l sync '__fish_contains_opt -s S sync'
set -l upgrade '__fish_contains_opt -s U upgrade' set -l upgrade '__fish_contains_opt -s U upgrade'
set -l files '__fish_contains_opt -s F files' set -l files '__fish_contains_opt -s F files'
set -l yayspecific '__fish_contains_opt -s Y yay'
complete -c pacman -e complete -c pacman -e
complete -c pacman -f complete -c pacman -f
@ -28,6 +30,7 @@ complete -c $progname -n $noopt -a "-Q" -d "Query the package database"
complete -c $progname -s D -f -l database -n $noopt -d 'Modify the package database' 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 Q -f -l query -n $noopt -d 'Query the package database'
complete -c $progname -s G -f -l getpkgbuild -n $noopt -d 'Get PKGBUILD from ABS or AUR' complete -c $progname -s G -f -l getpkgbuild -n $noopt -d 'Get PKGBUILD from ABS or AUR'
complete -c $progname -s P -f -l print -n $noopt -d 'Print information'
complete -c $progname -s R -f -l remove -n $noopt -d 'Remove packages from the system' 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 S -f -l sync -n $noopt -d 'Synchronize packages'
complete -c $progname -s T -f -l deptest -n $noopt -d 'Check if dependencies are installed' complete -c $progname -s T -f -l deptest -n $noopt -d 'Check if dependencies are installed'

View file

@ -5,509 +5,509 @@ setopt extendedglob
# options for passing to _arguments: main pacman commands # options for passing to _arguments: main pacman commands
_pacman_opts_commands=( _pacman_opts_commands=(
{-D,--database}'[Modify database]' {-D,--database}'[Modify database]'
{-F,--files}'[Query the files database]' {-F,--files}'[Query the files database]'
{-G,--getpkgbuild}'[Get PKGBUILD from ABS or AUR]' {-G,--getpkgbuild}'[Get PKGBUILD from ABS or AUR]'
{-Q,--query}'[Query the package database]' {-Q,--query}'[Query the package database]'
{-R,--remove}'[Remove a package from the system]' {-R,--remove}'[Remove a package from the system]'
{-S,--sync}'[Synchronize packages]' {-S,--sync}'[Synchronize packages]'
{-T,--deptest}'[Check if dependencies are installed]' {-T,--deptest}'[Check if dependencies are installed]'
{-U,--upgrade}'[Upgrade a package]' {-U,--upgrade}'[Upgrade a package]'
{-V,--version}'[Display version and exit]' {-V,--version}'[Display version and exit]'
'(-h --help)'{-h,--help}'[Display usage]' '(-h --help)'{-h,--help}'[Display usage]'
) )
# options for passing to _arguments: options common to all commands # options for passing to _arguments: options common to all commands
_pacman_opts_common=( _pacman_opts_common=(
'--arch[Set an alternate architecture]' '--arch[Set an alternate architecture]'
{-b,--dbpath}'[Alternate database location]:database_location:_files -/' {-b,--dbpath}'[Alternate database location]:database_location:_files -/'
'--color[colorize the output]:color options:(always never auto)' '--color[colorize the output]:color options:(always never auto)'
{-h,--help}'[Display syntax for the given operation]' {-h,--help}'[Display syntax for the given operation]'
{-r,--root}'[Set alternate installation root]:installation root:_files -/' {-r,--root}'[Set alternate installation root]:installation root:_files -/'
{-v,--verbose}'[Be more verbose]' {-v,--verbose}'[Be more verbose]'
'--cachedir[Alternate package cache location]:cache_location:_files -/' '--cachedir[Alternate package cache location]:cache_location:_files -/'
'--config[An alternate configuration file]:config file:_files' '--config[An alternate configuration file]:config file:_files'
'--confirm[Always ask for confirmation]' '--confirm[Always ask for confirmation]'
'--debug[Display debug messages]' '--debug[Display debug messages]'
'--gpgdir[Set an alternate directory for GnuPG (instead of /etc/pacman.d/gnupg)]: :_files -/' '--gpgdir[Set an alternate directory for GnuPG (instead of /etc/pacman.d/gnupg)]: :_files -/'
'--hookdir[Set an alternate hook location]: :_files -/' '--hookdir[Set an alternate hook location]: :_files -/'
'--logfile[An alternate log file]:config file:_files' '--logfile[An alternate log file]:config file:_files'
'--noconfirm[Do not ask for confirmation]' '--noconfirm[Do not ask for confirmation]'
'--noprogressbar[Do not show a progress bar when downloading files]' '--noprogressbar[Do not show a progress bar when downloading files]'
'--noscriptlet[Do not execute the install scriptlet if one exists]' '--noscriptlet[Do not execute the install scriptlet if one exists]'
'--bottomup[Show AUR packages first]' '--bottomup[Show AUR packages first]'
'--topdown[Show repository packages first]' '--topdown[Show repository packages first]'
) )
# options for passing to _arguments: options for --upgrade commands # options for passing to _arguments: options for --upgrade commands
_pacman_opts_pkgfile=( _pacman_opts_pkgfile=(
'*-d[Skip dependency checks]' '*-d[Skip dependency checks]'
'*--nodeps[Skip dependency checks]' '*--nodeps[Skip dependency checks]'
'*--assume-installed[Add virtual package to satisfy dependencies]' '*--assume-installed[Add virtual package to satisfy dependencies]'
'--dbonly[Only remove database entry, do not remove files]' '--dbonly[Only remove database entry, do not remove files]'
'--force[Overwrite conflicting files]' '--force[Overwrite conflicting files]'
'--needed[Do not reinstall up to date packages]' '--needed[Do not reinstall up to date packages]'
'--asdeps[mark packages as non-explicitly installed]' '--asdeps[mark packages as non-explicitly installed]'
'--asexplicit[mark packages as explicitly installed]' '--asexplicit[mark packages as explicitly installed]'
{-p,--print}'[Only print the targets instead of performing the operation]' {-p,--print}'[Only print the targets instead of performing the operation]'
'*--ignore[Ignore a package upgrade]:package: _pacman_completions_all_packages' '*--ignore[Ignore a package upgrade]:package: _pacman_completions_all_packages'
'*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups' '*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups'
'--print-format[Specify how the targets should be printed]' '--print-format[Specify how the targets should be printed]'
'*:package file:_files -g "*.pkg.tar*~*.sig(.,@)"' '*:package file:_files -g "*.pkg.tar*~*.sig(.,@)"'
) )
# options for passing to _arguments: subactions for --query command # options for passing to _arguments: subactions for --query command
_pacman_opts_query_actions=( _pacman_opts_query_actions=(
'(-Q --query)'{-Q,--query} '(-Q --query)'{-Q,--query}
{-g,--groups}'[View all members of a package group]:*:package groups:->query_group' {-g,--groups}'[View all members of a package group]:*:package groups:->query_group'
{-o,--owns}'[Query the package that owns a file]:file:_files' {-o,--owns}'[Query the package that owns a file]:file:_files'
{-p,--file}'[Package file to query]:*:package file:->query_file' {-p,--file}'[Package file to query]:*:package file:->query_file'
{-s,--search}'[Search package names and descriptions]:*:search text:->query_search' {-s,--search}'[Search package names and descriptions]:*:search text:->query_search'
) )
# options for passing to _arguments: options for --query and subcommands # options for passing to _arguments: options for --query and subcommands
_pacman_opts_query_modifiers=( _pacman_opts_query_modifiers=(
{-c,--changelog}'[List package changelog]' {-c,--changelog}'[List package changelog]'
{-d,--deps}'[List packages installed as dependencies]' {-d,--deps}'[List packages installed as dependencies]'
{-e,--explicit}'[List packages explicitly installed]' {-e,--explicit}'[List packages explicitly installed]'
{\*-i,\*--info}'[View package information]' {\*-i,\*--info}'[View package information]'
{\*-k,\*--check}'[Check package files]' {\*-k,\*--check}'[Check package files]'
{-l,--list}'[List package contents]' {-l,--list}'[List package contents]'
{-m,--foreign}'[List installed packages not found in sync db(s)]' {-m,--foreign}'[List installed packages not found in sync db(s)]'
{-n,--native}'[List installed packages found in sync db(s)]' {-n,--native}'[List installed packages found in sync db(s)]'
{-q,--quiet}'[Show less information for query and search]' {-q,--quiet}'[Show less information for query and search]'
{-t,--unrequired}'[List packages not required by any package]' {-t,--unrequired}'[List packages not required by any package]'
{-u,--upgrades}'[List packages that can be upgraded]' {-u,--upgrades}'[List packages that can be upgraded]'
) )
# options for passing to _arguments: options for --remove command # options for passing to _arguments: options for --remove command
_pacman_opts_remove=( _pacman_opts_remove=(
{-c,--cascade}'[Remove all dependent packages]' {-c,--cascade}'[Remove all dependent packages]'
{-d,--nodeps}'[Skip dependency checks]' {-d,--nodeps}'[Skip dependency checks]'
'*--assume-installed[Add virtual package to satisfy dependencies]' '*--assume-installed[Add virtual package to satisfy dependencies]'
{-n,--nosave}'[Remove protected configuration files]' {-n,--nosave}'[Remove protected configuration files]'
{-p,--print}'[Only print the targets instead of performing the operation]' {-p,--print}'[Only print the targets instead of performing the operation]'
{\*-s,\*--recursive}'[Remove dependencies not required by other packages]' {\*-s,\*--recursive}'[Remove dependencies not required by other packages]'
{-u,--unneeded}'[Remove unneeded packages]' {-u,--unneeded}'[Remove unneeded packages]'
'--dbonly[Only remove database entry, do not remove files]' '--dbonly[Only remove database entry, do not remove files]'
'--print-format[Specify how the targets should be printed]' '--print-format[Specify how the targets should be printed]'
'*:installed package:_pacman_completions_installed_packages' '*:installed package:_pacman_completions_installed_packages'
) )
_pacman_opts_database=( _pacman_opts_database=(
'--asdeps[mark packages as non-explicitly installed]' '--asdeps[mark packages as non-explicitly installed]'
'--asexplicit[mark packages as explicitly installed]' '--asexplicit[mark packages as explicitly installed]'
'*:installed package:_pacman_completions_installed_packages' '*:installed package:_pacman_completions_installed_packages'
) )
_pacman_opts_files=( _pacman_opts_files=(
{-l,--list}'[List the files owned by the queried package]:package:_pacman_completions_all_packages' {-l,--list}'[List the files owned by the queried package]:package:_pacman_completions_all_packages'
{-o,--owns}'[Query the package that owns]:files:_files' {-o,--owns}'[Query the package that owns]:files:_files'
{-s,--search}'[Search package file names for matching strings]:files:_files' {-s,--search}'[Search package file names for matching strings]:files:_files'
{-x,--regex}'[Enable searching using regluar expressions]:regex:' {-x,--regex}'[Enable searching using regluar expressions]:regex:'
{-y,--refresh}'[Download fresh files databases from the server]' {-y,--refresh}'[Download fresh files databases from the server]'
'--machinereadable[Produce machine-readable output]' '--machinereadable[Produce machine-readable output]'
{-q,--quiet}'[Show less information for query and search]' {-q,--quiet}'[Show less information for query and search]'
) )
# options for passing to _arguments: options for --sync command # options for passing to _arguments: options for --sync command
_pacman_opts_sync_actions=( _pacman_opts_sync_actions=(
'(-S --sync)'{-S,--sync} '(-S --sync)'{-S,--sync}
{\*-c,\*--clean}'[Remove old packages from cache]:\*:clean:->sync_clean' {\*-c,\*--clean}'[Remove old packages from cache]:\*:clean:->sync_clean'
{-g,--groups}'[View all members of a package group]:*:package groups:->sync_group' {-g,--groups}'[View all members of a package group]:*:package groups:->sync_group'
{-s,--search}'[Search package names and descriptions]:*:search text:->sync_search' {-s,--search}'[Search package names and descriptions]:*:search text:->sync_search'
'--dbonly[Only remove database entry, do not remove files]' '--dbonly[Only remove database entry, do not remove files]'
'--needed[Do not reinstall up to date packages]' '--needed[Do not reinstall up to date packages]'
'--recursive[Reinstall all dependencies of target packages]' '--recursive[Reinstall all dependencies of target packages]'
) )
# options for passing to _arguments: options for --sync command # options for passing to _arguments: options for --sync command
_pacman_opts_sync_modifiers=( _pacman_opts_sync_modifiers=(
{\*-d,\*--nodeps}'[Skip dependency checks]' {\*-d,\*--nodeps}'[Skip dependency checks]'
'*--assume-installed[Add virtual package to satisfy dependencies]' '*--assume-installed[Add virtual package to satisfy dependencies]'
{\*-i,\*--info}'[View package information]' {\*-i,\*--info}'[View package information]'
{-l,--list}'[List all packages in a repository]' {-l,--list}'[List all packages in a repository]'
{-p,--print}'[Print download URIs for each package to be installed]' {-p,--print}'[Print download URIs for each package to be installed]'
{-q,--quiet}'[Show less information for query and search]' {-q,--quiet}'[Show less information for query and search]'
{\*-u,\*--sysupgrade}'[Upgrade all out-of-date packages]' {\*-u,\*--sysupgrade}'[Upgrade all out-of-date packages]'
{-w,--downloadonly}'[Download packages only]' {-w,--downloadonly}'[Download packages only]'
{\*-y,\*--refresh}'[Download fresh package databases]' {\*-y,\*--refresh}'[Download fresh package databases]'
'*--ignore[Ignore a package upgrade]:package: _pacman_completions_all_packages' '*--ignore[Ignore a package upgrade]:package: _pacman_completions_all_packages'
'*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups' '*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups'
'--asdeps[Install packages as non-explicitly installed]' '--asdeps[Install packages as non-explicitly installed]'
'--asexplicit[Install packages as explicitly installed]' '--asexplicit[Install packages as explicitly installed]'
'--force[Overwrite conflicting files]' '--force[Overwrite conflicting files]'
'--print-format[Specify how the targets should be printed]' '--print-format[Specify how the targets should be printed]'
) )
# handles --help subcommand # handles --help subcommand
_pacman_action_help() { _pacman_action_help() {
_arguments -s : \ _arguments -s : \
"$_pacman_opts_commands[@]" "$_pacman_opts_commands[@]"
} }
# handles cases where no subcommand has yet been given # handles cases where no subcommand has yet been given
_pacman_action_none() { _pacman_action_none() {
_arguments -s : \ _arguments -s : \
"$_pacman_opts_commands[@]" "$_pacman_opts_commands[@]"
} }
# handles --query subcommand # handles --query subcommand
_pacman_action_query() { _pacman_action_query() {
local context state line local context state line
typeset -A opt_args typeset -A opt_args
case $state in case $state in
query_file) query_file)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:package file:_files -g "*.pkg.tar*~*.sig(.,@)"' '*:package file:_files -g "*.pkg.tar*~*.sig(.,@)"'
;; ;;
query_group) query_group)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:groups:_pacman_completions_installed_groups' '*:groups:_pacman_completions_installed_groups'
;; ;;
query_owner) query_owner)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:file:_files' '*:file:_files'
;; ;;
query_search) query_search)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:search text: ' '*:search text: '
;; ;;
*) *)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_query_actions[@]" \ "$_pacman_opts_query_actions[@]" \
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:package:_pacman_completions_installed_packages' '*:package:_pacman_completions_installed_packages'
;; ;;
esac esac
} }
# handles --remove subcommand # handles --remove subcommand
_pacman_action_remove() { _pacman_action_remove() {
_arguments -s : \ _arguments -s : \
'(--remove -R)'{-R,--remove} \ '(--remove -R)'{-R,--remove} \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_remove[@]" "$_pacman_opts_remove[@]"
} }
# handles --database subcommand # handles --database subcommand
_pacman_action_database() { _pacman_action_database() {
_arguments -s : \ _arguments -s : \
'(--database -D)'{-D,--database} \ '(--database -D)'{-D,--database} \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_database[@]" "$_pacman_opts_database[@]"
} }
# handles --files subcommand # handles --files subcommand
_pacman_action_files() { _pacman_action_files() {
_arguments -s : \ _arguments -s : \
'(--files -F)'{-F,--files} \ '(--files -F)'{-F,--files} \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_files[@]" "$_pacman_opts_files[@]"
} }
_pacman_action_deptest () { _pacman_action_deptest () {
_arguments -s : \ _arguments -s : \
'(--deptest)-T' \ '(--deptest)-T' \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
":packages:_pacman_all_packages" ":packages:_pacman_all_packages"
} }
# handles --sync subcommand # handles --sync subcommand
_pacman_action_sync() { _pacman_action_sync() {
local context state line local context state line
typeset -A opt_args typeset -A opt_args
if (( $+words[(r)--clean] )); then if (( $+words[(r)--clean] )); then
state=sync_clean state=sync_clean
elif (( $+words[(r)--groups] )); then elif (( $+words[(r)--groups] )); then
state=sync_group state=sync_group
elif (( $+words[(r)--search] )); then elif (( $+words[(r)--search] )); then
state=sync_search state=sync_search
fi fi
case $state in case $state in
sync_clean) sync_clean)
_arguments -s : \ _arguments -s : \
{\*-c,\*--clean}'[Remove old packages from cache]' \ {\*-c,\*--clean}'[Remove old packages from cache]' \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_sync_modifiers[@]" "$_pacman_opts_sync_modifiers[@]"
;; ;;
sync_group) sync_group)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_sync_modifiers[@]" \ "$_pacman_opts_sync_modifiers[@]" \
'(-g --group)'{-g,--groups} \ '(-g --group)'{-g,--groups} \
'*:package group:_pacman_completions_all_groups' '*:package group:_pacman_completions_all_groups'
;; ;;
sync_search) sync_search)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_sync_modifiers[@]" \ "$_pacman_opts_sync_modifiers[@]" \
'*:search text: ' '*:search text: '
;; ;;
*) *)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_sync_actions[@]" \ "$_pacman_opts_sync_actions[@]" \
"$_pacman_opts_sync_modifiers[@]" \ "$_pacman_opts_sync_modifiers[@]" \
'*:package:_pacman_completions_all_packages' '*:package:_pacman_completions_all_packages'
;; ;;
esac esac
} }
# handles --upgrade subcommand # handles --upgrade subcommand
_pacman_action_upgrade() { _pacman_action_upgrade() {
_arguments -s : \ _arguments -s : \
'(-U --upgrade)'{-U,--upgrade} \ '(-U --upgrade)'{-U,--upgrade} \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_pkgfile[@]" "$_pacman_opts_pkgfile[@]"
} }
# handles --version subcommand # handles --version subcommand
_pacman_action_version() { _pacman_action_version() {
# no further arguments # no further arguments
return 0 return 0
} }
# provides completions for package groups # provides completions for package groups
_pacman_completions_all_groups() { _pacman_completions_all_groups() {
local -a cmd groups local -a cmd groups
_pacman_get_command _pacman_get_command
groups=( $(_call_program groups $cmd[@] -Sg) ) groups=( $(_call_program groups $cmd[@] -Sg) )
typeset -U groups typeset -U groups
if [[ ${words[CURRENT-1]} == '--ignoregroup' ]]; then if [[ ${words[CURRENT-1]} == '--ignoregroup' ]]; then
_sequence compadd -S ',' "$@" -a groups _sequence compadd -S ',' "$@" -a groups
else else
compadd "$@" -a groups compadd "$@" -a groups
fi fi
} }
# provides completions for packages available from repositories # provides completions for packages available from repositories
# these can be specified as either 'package' or 'repository/package' # these can be specified as either 'package' or 'repository/package'
_pacman_completions_all_packages() { _pacman_completions_all_packages() {
local -a seq sep cmd packages repositories packages_long local -a seq sep cmd packages repositories packages_long
if [[ ${words[CURRENT-1]} == '--ignore' ]]; then if [[ ${words[CURRENT-1]} == '--ignore' ]]; then
seq='_sequence' seq='_sequence'
sep=(-S ',') sep=(-S ',')
else else
seq= seq=
sep=() sep=()
fi fi
if compset -P1 '*/*'; then if compset -P1 '*/*'; then
packages=( $(_call_program packages yay --complete ${words[CURRENT]%/*}) ) packages=( $(_call_program packages yay -Pc ${words[CURRENT]%/*}) )
typeset -U packages typeset -U packages
${seq} _wanted repo_packages expl "repository/package" compadd ${sep[@]} ${(@)packages} ${seq} _wanted repo_packages expl "repository/package" compadd ${sep[@]} ${(@)packages}
else else
packages=( $(_call_program packages yay --complete ) ) packages=( $(_call_program packages yay -Pc ) )
typeset -U packages typeset -U packages
${seq} _wanted packages expl "packages" compadd ${sep[@]} - "${(@)packages}" ${seq} _wanted packages expl "packages" compadd ${sep[@]} - "${(@)packages}"
repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
typeset -U repositories typeset -U repositories
_wanted repo_packages expl "repository/package" compadd -S "/" $repositories _wanted repo_packages expl "repository/package" compadd -S "/" $repositories
fi fi
} }
# provides completions for package groups # provides completions for package groups
_pacman_completions_installed_groups() { _pacman_completions_installed_groups() {
local -a cmd groups local -a cmd groups
_pacman_get_command _pacman_get_command
groups=(${(o)${(f)"$(_call_program groups $cmd[@] -Qg)"}% *}) groups=(${(o)${(f)"$(_call_program groups $cmd[@] -Qg)"}% *})
typeset -U groups typeset -U groups
compadd "$@" -a groups compadd "$@" -a groups
} }
# provides completions for installed packages # provides completions for installed packages
_pacman_completions_installed_packages() { _pacman_completions_installed_packages() {
local -a cmd packages packages_long local -a cmd packages packages_long
packages_long=(/var/lib/pacman/local/*(/)) packages_long=(/var/lib/pacman/local/*(/))
packages=( ${${packages_long#/var/lib/pacman/local/}%-*-*} ) packages=( ${${packages_long#/var/lib/pacman/local/}%-*-*} )
compadd "$@" -a packages compadd "$@" -a packages
} }
_pacman_all_packages() { _pacman_all_packages() {
_alternative : \ _alternative : \
'localpkgs:local packages:_pacman_completions_installed_packages' \ 'localpkgs:local packages:_pacman_completions_installed_packages' \
'repopkgs:repository packages:_pacman_completions_all_packages' 'repopkgs:repository packages:_pacman_completions_all_packages'
} }
# provides completions for repository names # provides completions for repository names
_pacman_completions_repositories() { _pacman_completions_repositories() {
local -a cmd repositories local -a cmd repositories
repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
# Uniq the array # Uniq the array
typeset -U repositories typeset -U repositories
compadd "$@" -a repositories compadd "$@" -a repositories
} }
# builds command for invoking pacman in a _call_program command - extracts # builds command for invoking pacman in a _call_program command - extracts
# relevant options already specified (config file, etc) # relevant options already specified (config file, etc)
# $cmd must be declared by calling function # $cmd must be declared by calling function
_pacman_get_command() { _pacman_get_command() {
# this is mostly nicked from _perforce # this is mostly nicked from _perforce
cmd=( "pacman" "2>/dev/null") cmd=( "pacman" "2>/dev/null")
integer i integer i
for (( i = 2; i < CURRENT - 1; i++ )); do for (( i = 2; i < CURRENT - 1; i++ )); do
if [[ ${words[i]} = "--config" || ${words[i]} = "--root" ]]; then if [[ ${words[i]} = "--config" || ${words[i]} = "--root" ]]; then
cmd+=( ${words[i,i+1]} ) cmd+=( ${words[i,i+1]} )
fi fi
done done
} }
# main dispatcher # main dispatcher
_pacman_zsh_comp() { _pacman_zsh_comp() {
local -a args cmds; local -a args cmds;
local tmp local tmp
args=( ${${${(M)words:#-*}#-}:#-*} ) args=( ${${${(M)words:#-*}#-}:#-*} )
for tmp in $words; do for tmp in $words; do
cmds+=("${${_pacman_opts_commands[(r)*$tmp\[*]%%\[*}#*\)}") cmds+=("${${_pacman_opts_commands[(r)*$tmp\[*]%%\[*}#*\)}")
done done
case $args in #$words[2] in case $args in #$words[2] in
h*) h*)
if (( ${(c)#args} <= 1 && ${(w)#cmds} <= 1 )); then if (( ${(c)#args} <= 1 && ${(w)#cmds} <= 1 )); then
_pacman_action_help _pacman_action_help
else else
_message "no more arguments" _message "no more arguments"
fi fi
;; ;;
*h*) *h*)
_message "no more arguments" _message "no more arguments"
;; ;;
D*) D*)
_pacman_action_database _pacman_action_database
;; ;;
F*) F*)
_pacman_action_files _pacman_action_files
;; ;;
Q*g*) # ipkg groups Q*g*) # ipkg groups
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:groups:_pacman_completions_installed_groups' '*:groups:_pacman_completions_installed_groups'
;; ;;
Q*o*) # file Q*o*) # file
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:package file:_files' '*:package file:_files'
;; ;;
Q*p*) # file *.pkg.tar* Q*p*) # file *.pkg.tar*
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \ "$_pacman_opts_query_modifiers[@]" \
'*:package file:_files -g "*.pkg.tar*~*.sig(.,@)"' '*:package file:_files -g "*.pkg.tar*~*.sig(.,@)"'
;; ;;
T*) T*)
_pacman_action_deptest _pacman_action_deptest
;; ;;
Q*) Q*)
_pacman_action_query _pacman_action_query
;; ;;
R*) R*)
_pacman_action_remove _pacman_action_remove
;; ;;
S*c*) # no completion S*c*) # no completion
_arguments -s : \ _arguments -s : \
'(-c --clean)'{\*-c,\*--clean}'[Remove all files from the cache]' \ '(-c --clean)'{\*-c,\*--clean}'[Remove all files from the cache]' \
"$_pacman_opts_common[@]" "$_pacman_opts_common[@]"
;; ;;
S*l*) # repos S*l*) # repos
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_sync_modifiers[@]" \ "$_pacman_opts_sync_modifiers[@]" \
'*:package repo:_pacman_completions_repositories' \ '*:package repo:_pacman_completions_repositories' \
;; ;;
S*g*) # pkg groups S*g*) # pkg groups
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_sync_modifiers[@]" \ "$_pacman_opts_sync_modifiers[@]" \
'*:package group:_pacman_completions_all_groups' '*:package group:_pacman_completions_all_groups'
;; ;;
S*s*) S*s*)
_arguments -s : \ _arguments -s : \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
"$_pacman_opts_sync_modifiers[@]" \ "$_pacman_opts_sync_modifiers[@]" \
'*:search text: ' '*:search text: '
;; ;;
S*) S*)
_pacman_action_sync _pacman_action_sync
;; ;;
T*) T*)
_arguments -s : \ _arguments -s : \
'-T' \ '-T' \
"$_pacman_opts_common[@]" \ "$_pacman_opts_common[@]" \
":packages:_pacman_all_packages" ":packages:_pacman_all_packages"
;; ;;
U*) U*)
_pacman_action_upgrade _pacman_action_upgrade
;; ;;
V*) V*)
_pacman_action_version _pacman_action_version
;; ;;
*) *)
case ${(M)words:#--*} in case ${(M)words:#--*} in
*--help*) *--help*)
if (( ${(w)#cmds} == 1 )); then if (( ${(w)#cmds} == 1 )); then
_pacman_action_help _pacman_action_help
else else
return 0; return 0;
fi fi
;; ;;
*--sync*) *--sync*)
_pacman_action_sync _pacman_action_sync
;; ;;
*--query*) *--query*)
_pacman_action_query _pacman_action_query
;; ;;
*--remove*) *--remove*)
_pacman_action_remove _pacman_action_remove
;; ;;
*--deptest*) *--deptest*)
_pacman_action_deptest _pacman_action_deptest
;; ;;
*--database*) *--database*)
_pacman_action_database _pacman_action_database
;; ;;
*--files*) *--files*)
_pacman_action_files _pacman_action_files
;; ;;
*--version*) *--version*)
_pacman_action_version _pacman_action_version
;; ;;
*--upgrade*) *--upgrade*)
_pacman_action_upgrade _pacman_action_upgrade
;; ;;
*) *)
_pacman_action_none _pacman_action_none
;; ;;
esac esac
;; ;;
esac esac
} }
_pacman_comp() { _pacman_comp() {
case "$service" in case "$service" in
yay) yay)
_pacman_zsh_comp "$@" _pacman_zsh_comp "$@"
;; ;;
*) *)
_message "Error" _message "Error"
;; ;;
esac esac
} }
_pacman_comp "$@" _pacman_comp "$@"