Compare commits

..

2 commits

Author SHA1 Message Date
Daniel Oh 836fc5922a
add short option for --repo (#2380)
* add short option for --repo

* run pre-commit

* update man page

* add fish completion

* add a N options

* add long options

---------

Co-authored-by: jguer <me@jguer.space>
2024-06-28 16:40:35 +02:00
Joey Holtzman 0165486bf4
Respect provided targets when using -Si flag (#2460) 2024-06-28 16:39:49 +02:00
8 changed files with 15 additions and 9 deletions

2
cmd.go
View file

@ -54,7 +54,7 @@ If no operation is specified 'yay -Syu' will be performed
If no operation is specified and targets are provided -Y will be assumed If no operation is specified and targets are provided -Y will be assumed
New options: New options:
--repo Assume targets are from the repositories -N --repo Assume targets are from the repositories
-a --aur Assume targets are from the AUR -a --aur Assume targets are from the AUR
Permanent configuration options: Permanent configuration options:

View file

@ -61,8 +61,8 @@ _yay() {
search unrequired upgrades' 'c e g i k l m n o p s t u') search unrequired upgrades' 'c e g i k l m n o p s t u')
remove=('cascade dbonly nodeps assume-installed nosave print recursive unneeded' 'c n p s u') remove=('cascade dbonly nodeps assume-installed nosave print recursive unneeded' 'c n p s u')
sync=('asdeps asexplicit clean dbonly downloadonly overwrite groups ignore ignoregroup sync=('asdeps asexplicit clean dbonly downloadonly overwrite groups ignore ignoregroup
info list needed nodeps assume-installed print refresh recursive search sysupgrade' info list needed nodeps assume-installed print refresh recursive search sysupgrade aur repo'
'c g i l p s u w y') 'c g i l p s u w y a N')
upgrade=('asdeps asexplicit overwrite needed nodeps assume-installed print recursive' 'p') upgrade=('asdeps asexplicit overwrite needed nodeps assume-installed print recursive' 'p')
core=('database files help query remove sync upgrade version' 'D F Q R S U V h') core=('database files help query remove sync upgrade version' 'D F Q R S U V h')

View file

@ -165,7 +165,7 @@ complete -c $progname -n "$webspecific" -s u -l unvote -d 'Unvote for AUR packag
complete -c $progname -n "$webspecific" -xa "$listall" complete -c $progname -n "$webspecific" -xa "$listall"
# New options # New options
complete -c $progname -n "not $noopt" -l repo -d 'Assume targets are from the AUR' -f complete -c $progname -n "not $noopt" -s N -l repo -d 'Assume targets are from the AUR' -f
complete -c $progname -n "not $noopt" -s a -l aur -d 'Assume targets are from the repositories' -f complete -c $progname -n "not $noopt" -s a -l aur -d 'Assume targets are from the repositories' -f
# Yay options # Yay options

View file

@ -23,7 +23,7 @@ _pacman_opts_commands=(
# 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=(
'--repo[Assume targets are from the repositories]' {-N,--repo}'[Assume targets are from the repositories]'
{-a,--aur}'[Assume targets are from the AUR]' {-a,--aur}'[Assume targets are from the AUR]'
'--aururl[Set an alternative AUR URL]:url' '--aururl[Set an alternative AUR URL]:url'
'--aurrpcurl[Set an alternative URL for the AUR /rpc endpoint]:url' '--aurrpcurl[Set an alternative URL for the AUR /rpc endpoint]:url'

View file

@ -63,7 +63,7 @@ Yay will also remove cached data about devel packages.
.SH NEW OPTIONS .SH NEW OPTIONS
.TP .TP
.B \-\-repo .B \-N, \-\-repo
Assume all targets are from the repositories. Additionally Actions such as Assume all targets are from the repositories. Additionally Actions such as
sysupgrade will only act on repository packages. sysupgrade will only act on repository packages.

View file

@ -169,7 +169,7 @@ func (c *Configuration) handleOption(option, value string) bool {
c.CombinedUpgrade = boolValue c.CombinedUpgrade = boolValue
case "a", "aur": case "a", "aur":
c.Mode = parser.ModeAUR c.Mode = parser.ModeAUR
case "repo": case "N", "repo":
c.Mode = parser.ModeRepo c.Mode = parser.ModeRepo
case "removemake": case "removemake":
c.RemoveMake = "yes" c.RemoveMake = "yes"

View file

@ -425,7 +425,7 @@ func isArg(arg string) bool {
case "useask": case "useask":
case "combinedupgrade": case "combinedupgrade":
case "a", "aur": case "a", "aur":
case "repo": case "N", "repo":
case "removemake": case "removemake":
case "noremovemake": case "noremovemake":
case "askremovemake": case "askremovemake":

View file

@ -46,7 +46,13 @@ func syncInfo(ctx context.Context, run *runtime.Runtime,
aurS, repoS := packageSlices(pkgS, run.Cfg, dbExecutor) aurS, repoS := packageSlices(pkgS, run.Cfg, dbExecutor)
if len(repoS) == 0 && len(aurS) == 0 { if len(repoS) == 0 && len(aurS) == 0 {
aurS = dbExecutor.InstalledRemotePackageNames() if run.Cfg.Mode != parser.ModeRepo {
aurS = dbExecutor.InstalledRemotePackageNames()
}
if run.Cfg.Mode != parser.ModeAUR {
repoS = dbExecutor.InstalledSyncPackageNames()
}
} }
if len(aurS) != 0 { if len(aurS) != 0 {