Skip to content

fix(menu): add missing space to '[No]t Installed' prompt and fix typos in CLI texts #2931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rayrsn wants to merge 2 commits into
base: next
Choose a base branch
from
Open

fix(menu): add missing space to '[No]t Installed' prompt and fix typos in CLI texts #2931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70fbe05
fix: improve menu selection logic and correct "Not Installed" typo in…
Rayrsn Jul 23, 2026
f43a7c9
refactor: standardize PKGBUILD casing and improve consistency of UI s…
Rayrsn Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ pacman -S --needed git base-devel yay
set `PAGER` to override the default (`less`, or `cat` if less is unavailable).
Example: `yay.opt.pager = "delta"` or `export PAGER=less`.

- **yay is not asking me to edit PKGBUILDS, and I don't like the diff menu! What can I do?**
- **yay is not asking me to edit PKGBUILDs, and I don't like the diff menu! What can I do?**

`yay --editmenu --diffmenu=false --save`

Expand Down
24 changes: 12 additions & 12 deletions cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Permanent configuration options:

--aururl <url> Set an alternative AUR URL
--aurrpcurl <url> Set an alternative URL for the AUR /rpc endpoint
--builddir <dir> Directory used to download and run PKGBUILDS
--builddir <dir> Directory used to download and run PKGBUILDs
--editor <file> Editor to use when editing PKGBUILDs
--editorflags <flags> Pass arguments to editor
--makepkg <file> makepkg command to use
Expand All @@ -83,17 +83,17 @@ Permanent configuration options:
--searchby <field> Search for packages using a specified field
--answerclean <a> Set a predetermined answer for the clean build menu
--answerdiff <a> Set a predetermined answer for the diff menu
--answeredit <a> Set a predetermined answer for the edit pkgbuild menu
--answeredit <a> Set a predetermined answer for the edit PKGBUILD menu
--answerupgrade <a> Set a predetermined answer for the upgrade menu
--noanswerclean Unset the answer for the clean build menu
--noanswerdiff Unset the answer for the edit diff menu
--noansweredit Unset the answer for the edit pkgbuild menu
--noanswerdiff Unset the answer for the diff menu
--noansweredit Unset the answer for the edit PKGBUILD menu
--noanswerupgrade Unset the answer for the upgrade menu
--cleanmenu Give the option to clean build PKGBUILDS
--cleanmenu Give the option to clean build PKGBUILDs
--diffmenu Give the option to show diffs for build files
--editmenu Give the option to edit/view PKGBUILDS
--editmenu Give the option to edit/view PKGBUILDs
--askremovemake Ask to remove makedepends after install
--askyesremovemake Ask to remove makedepends after install("Y" as default)
--askyesremovemake Ask to remove makedepends after install ("Y" as default)
--removemake Remove makedepends after install
--noremovemake Don't remove makedepends after install

Expand All @@ -109,9 +109,9 @@ Permanent configuration options:
--rebuildall Always build all AUR packages
--norebuild Skip package build if in cache and up to date
--rebuildtree Always build all AUR packages even if installed
--redownload Always download pkgbuilds of targets
--noredownload Skip pkgbuild download if in cache and up to date
--redownloadall Always download pkgbuilds of all AUR packages
--redownload Always download PKGBUILDs of targets
--noredownload Skip PKGBUILD download if in cache and up to date
--redownloadall Always download PKGBUILDs of all AUR packages
--provides Look for matching providers when searching for packages
--pgpfetch Prompt to import PGP keys from PKGBUILDs
--useask Automatically resolve conflicts using pacman's ask flag
Expand All @@ -125,15 +125,15 @@ show specific options (used with -P):
-d --defaultconfig Print default yay configuration
-g --currentconfig Print current yay configuration
-s --stats Display system package statistics
-w --news Print arch news
-w --news Print Arch news

yay specific options (used with -Y):
-c --clean Remove unneeded dependencies (-cc to ignore optdepends)
--gendb Generates development package DB used for updating

getpkgbuild specific options (used with -G):
-f --force Force download for existing ABS packages
-p --print Print pkgbuild of packages`)
-p --print Print PKGBUILD of packages`)
}

func handleCmd(ctx context.Context, run *runtime.Runtime,
Expand Down
10 changes: 5 additions & 5 deletions completions/fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,16 @@ complete -c $progname -n "not $noopt" -l answeredit -d 'Set a predetermined answ
complete -c $progname -n "not $noopt" -l answerupgrade -d 'Set a predetermined answer for the upgrade menu' -x
complete -c $progname -n "not $noopt" -l noanswerclean -d 'Unset the answer for the clean build menu' -f
complete -c $progname -n "not $noopt" -l noanswerdiff -d 'Unset the answer for the diff menu' -f
complete -c $progname -n "not $noopt" -l noansweredit -d 'Unset the answer for the edit pkgbuild menu' -f
complete -c $progname -n "not $noopt" -l noansweredit -d 'Unset the answer for the edit PKGBUILD menu' -f
complete -c $progname -n "not $noopt" -l noanswerupgrade -d 'Unset the answer for the upgrade menu' -f
complete -c $progname -n "not $noopt" -l cleanmenu -d 'Give the option to clean build PKGBUILDS' -f
complete -c $progname -n "not $noopt" -l cleanmenu -d 'Give the option to clean build PKGBUILDs' -f
complete -c $progname -n "not $noopt" -l diffmenu -d 'Give the option to show diffs for build files' -f
complete -c $progname -n "not $noopt" -l editmenu -d 'Give the option to edit/view PKGBUILDS' -f
complete -c $progname -n "not $noopt" -l editmenu -d 'Give the option to edit/view PKGBUILDs' -f
complete -c $progname -n "not $noopt" -l askremovemake -d 'Ask to remove make deps after install' -f
complete -c $progname -n "not $noopt" -l askyesremovemake -d 'Ask to remove make deps after install(with "Y" as default)' -f
complete -c $progname -n "not $noopt" -l askyesremovemake -d 'Ask to remove make deps after install (with "Y" as default)' -f
complete -c $progname -n "not $noopt" -l removemake -d 'Remove make deps after install' -f
complete -c $progname -n "not $noopt" -l noremovemake -d 'Do not remove make deps after install' -f
complete -c $progname -n "not $noopt" -l topdown -d 'Shows repository packages first and then aur' -f
complete -c $progname -n "not $noopt" -l topdown -d 'Shows repository packages first and then AUR' -f
complete -c $progname -n "not $noopt" -l bottomup -d 'Shows aur packages first and then repository' -f
complete -c $progname -n "not $noopt" -l singlelineresults -d 'List each search result on its own line' -f
complete -c $progname -n "not $noopt" -l doublelineresults -d 'List each search result on two lines, like pacman' -f
Expand Down
10 changes: 5 additions & 5 deletions completions/zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ _pacman_opts_common=(
'--searchby[Search for packages using a specified field]:query'
'(--noanswerclean)--answerclean[Set a predetermined answer for the clean build menu]:answer'
'(--noanswerdiff)--answerdiff[Set a predetermined answer for the diff menu]:answer'
'(--noansweredit)--answeredit[Set a predetermined answer for the edit pkgbuild menu]:answer'
'(--noansweredit)--answeredit[Set a predetermined answer for the edit PKGBUILD menu]:answer'
'(--noanswerupgrade)--answerupgrade[Set a predetermined answer for the upgrade menu]:answer'
'(--answerclean)--noanswerclean[Unset the answer for the clean build menu]'
'(--answerdiff)--noanswerdiff[Unset the answer for the diff menu]'
'(--answeredit)--noansweredit[Unset the answer for the edit pkgbuild menu]'
'(--answeredit)--noansweredit[Unset the answer for the edit PKGBUILD menu]'
'(--answerupgrade)--noanswerupgrade[Unset the answer for the upgrade menu]'
'--cleanmenu[Give the option to clean build PKGBUILDS]'
'--cleanmenu[Give the option to clean build PKGBUILDs]'
'--diffmenu[Give the option to show diffs for build files]'
'--editmenu[Give the option to edit/view PKGBUILDS]'
'--editmenu[Give the option to edit/view PKGBUILDs]'
'(--askyesremovemake --removemake --noremovemake)--askremovemake[Ask to remove makedepends after install]'
'(--askremovemake --removemake --noremovemake)--askyesremovemake[Ask to remove makedepends after install(with "Y" as default)]'
'(--askremovemake --removemake --noremovemake)--askyesremovemake[Ask to remove makedepends after install (with "Y" as default)]'
'(--askremovemake --askyesremovemake --noremovemake)--removemake[Remove makedepends after install]'
"(--askremovemake --askyesremovemake --removemake)--noremovemake[Don't remove makedepends after install]"

Expand Down
2 changes: 1 addition & 1 deletion doc/yay.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ Overridden by \-\-builddir.
.TP
.B VISUAL, EDITOR
When editor is not configured, use these variables to pick what editor
to use when editing PKGBUILDS.
to use when editing PKGBUILDs.

.TP
.B PAGER
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/graph/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func handleCmd(logger *text.Logger) error {
metadata.WithCacheFilePath(
filepath.Join(cfg.BuildDir, "aur.json")))
if err != nil {
return fmt.Errorf("%s: %w", gotext.Get("failed to retrieve aur Cache"), err)
return fmt.Errorf("%s: %w", gotext.Get("failed to retrieve AUR cache"), err)
}

grapher := dep.NewGrapher(dbExecutor, aurCache, true, settings.NoConfirm,
Expand Down
4 changes: 2 additions & 2 deletions pkg/menus/menu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func selectionMenu(logger *text.Logger, pkgbuildDirs map[string]string, bases []
pkgbuildNumberMenu(logger, pkgbuildDirs, bases, installed)

logger.Infoln(message)
logger.Infoln(gotext.Get("%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)", text.Cyan(gotext.Get("[N]one"))))
logger.Infoln(gotext.Get("%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)", text.Cyan(gotext.Get("[N]one"))))

selectInput, err := logger.GetInput(defaultAnswer, noConfirm)
if err != nil {
Expand Down Expand Up @@ -81,7 +81,7 @@ func selectionMenu(logger *text.Logger, pkgbuildDirs map[string]string, bases []
continue
}

if !anyInstalled && (eOtherInclude.Contains("no") || eOtherInclude.Contains("notinstalled")) {
if !anyInstalled && (eOtherInclude.Contains("no") || eOtherInclude.Contains("notinstalled") || eOtherInclude.Contains("not")) {
selected = append(selected, pkgBase)
continue
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func NewRuntime(cfg *settings.Configuration, cmdArgs *parser.Arguments, version
metadata.WithDebugLogger(logger.Debugln),
)
if errAURCache != nil {
return nil, fmt.Errorf(gotext.Get("failed to retrieve aur Cache")+": %w", errAURCache)
return nil, fmt.Errorf(gotext.Get("failed to retrieve AUR cache")+": %w", errAURCache)
}

aurClient, errAUR := rpc.NewClient(
Expand Down
6 changes: 3 additions & 3 deletions po/ca.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ msgid " there is nothing to do"
msgstr "No hi ha res per fer."

#: pkg/menus/menu.go:49
msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)"
msgid "%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)"
msgstr "%s [T]ot [Av]orta [I]nstal·lat [No] instal·lat o (1 2 3, 1-3, ^4)"

#: pkg/sync/build/installer.go:308
Expand Down Expand Up @@ -369,7 +369,7 @@ msgid "Packages not in AUR:"
msgstr "Paquets no a l'AUR:"

#: pkg/menus/clean_menu.go:54
msgid "Packages to cleanBuild?"
msgid "Packages to clean build?"
msgstr "Paquets per a la neteja de la construcció?"

#: pkg/dep/dep_graph.go:202
Expand Down Expand Up @@ -619,7 +619,7 @@ msgid "failed to read config file '%s': %s"
msgstr "ha fallat llegir el fitxer de configuració %s: %s"

#: pkg/cmd/graph/main.go:46 pkg/runtime/runtime.go:73
msgid "failed to retrieve aur Cache"
msgid "failed to retrieve AUR cache"
msgstr "ha fallat obtenir la cau de l'AUR"

#: pkg/upgrade/sources.go:27
Expand Down
6 changes: 3 additions & 3 deletions po/ca_ES.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ msgid " there is nothing to do"
msgstr "No hi ha res per fer."

#: pkg/menus/menu.go:49
msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)"
msgid "%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)"
msgstr "%s [T]ot [Av]orta [I]nstal·lat [No] instal·lat o (1 2 3, 1-3, ^4)"

#: pkg/sync/build/installer.go:308
Expand Down Expand Up @@ -369,7 +369,7 @@ msgid "Packages not in AUR:"
msgstr "Paquets no a l'AUR:"

#: pkg/menus/clean_menu.go:54
msgid "Packages to cleanBuild?"
msgid "Packages to clean build?"
msgstr "Paquets per a la neteja de la construcció?"

#: pkg/dep/dep_graph.go:202
Expand Down Expand Up @@ -619,7 +619,7 @@ msgid "failed to read config file '%s': %s"
msgstr "ha fallat llegir el fitxer de configuració %s: %s"

#: pkg/cmd/graph/main.go:46 pkg/runtime/runtime.go:73
msgid "failed to retrieve aur Cache"
msgid "failed to retrieve AUR cache"
msgstr "ha fallat obtenir la cau de l'AUR"

#: pkg/upgrade/sources.go:27
Expand Down
6 changes: 3 additions & 3 deletions po/cs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ msgid " there is nothing to do"
msgstr "není co dělat"

#: pkg/menus/menu.go:49
msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)"
msgid "%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)"
msgstr ""
"%s [A]Vše [Ab]Zrušit [I]Nainstalováno [No]Nenainstalováno nebo (1 2 3, 1-3, "
"^4)"
Expand Down Expand Up @@ -372,7 +372,7 @@ msgid "Packages not in AUR:"
msgstr "Balíčky mimo AUR:"

#: pkg/menus/clean_menu.go:54
msgid "Packages to cleanBuild?"
msgid "Packages to clean build?"
msgstr "Balíčky ke cleanBuild?"

#: pkg/dep/dep_graph.go:202
Expand Down Expand Up @@ -620,7 +620,7 @@ msgid "failed to read config file '%s': %s"
msgstr "nepodařilo se přečíst konfigurační soubor '%s': %s"

#: pkg/cmd/graph/main.go:46 pkg/runtime/runtime.go:73
msgid "failed to retrieve aur Cache"
msgid "failed to retrieve AUR cache"
msgstr "nepodařilo se získat aur Cache"

#: pkg/upgrade/sources.go:27
Expand Down
6 changes: 3 additions & 3 deletions po/da.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ msgid " there is nothing to do"
msgstr "der er intet at gøre"

#: pkg/menus/menu.go:49
msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)"
msgid "%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)"
msgstr ""
"%s [A]lle [Ab]afbryd [I]nstalleret [No]Ikke installeret eller (1 2 3, 1-3, "
"^4)"
Expand Down Expand Up @@ -376,7 +376,7 @@ msgid "Packages not in AUR:"
msgstr "Pakker er ikke i AUR:"

#: pkg/menus/clean_menu.go:54
msgid "Packages to cleanBuild?"
msgid "Packages to clean build?"
msgstr "Hvilke pakker til cleanBuild?"

#: pkg/dep/dep_graph.go:202
Expand Down Expand Up @@ -626,7 +626,7 @@ msgid "failed to read config file '%s': %s"
msgstr "mislykkedes med at læse konfigurationsfil '%s': %s"

#: pkg/cmd/graph/main.go:46 pkg/runtime/runtime.go:73
msgid "failed to retrieve aur Cache"
msgid "failed to retrieve AUR cache"
msgstr "mislykkedes med at hente aur Cache"

#: pkg/upgrade/sources.go:27
Expand Down
6 changes: 3 additions & 3 deletions po/da_DK.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ msgid " there is nothing to do"
msgstr "der er intet at gøre"

#: pkg/menus/menu.go:49
msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)"
msgid "%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)"
msgstr ""
"%s [A]lle [Ab]afbryd [I]nstalleret [No]Ikke installeret eller (1 2 3, 1-3, "
"^4)"
Expand Down Expand Up @@ -376,7 +376,7 @@ msgid "Packages not in AUR:"
msgstr "Pakker er ikke i AUR:"

#: pkg/menus/clean_menu.go:54
msgid "Packages to cleanBuild?"
msgid "Packages to clean build?"
msgstr "Hvilke pakker til cleanBuild?"

#: pkg/dep/dep_graph.go:202
Expand Down Expand Up @@ -626,7 +626,7 @@ msgid "failed to read config file '%s': %s"
msgstr "mislykkedes med at læse konfigurationsfil '%s': %s"

#: pkg/cmd/graph/main.go:46 pkg/runtime/runtime.go:73
msgid "failed to retrieve aur Cache"
msgid "failed to retrieve AUR cache"
msgstr "mislykkedes med at hente aur Cache"

#: pkg/upgrade/sources.go:27
Expand Down
6 changes: 3 additions & 3 deletions po/de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ msgid " there is nothing to do"
msgstr " es gibt nichts zu tun"

#: pkg/menus/menu.go:49
msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)"
msgid "%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)"
msgstr ""
"%s [A]lle [Ab]brechen [I]nstalliert [No]nicht installiert oder (1 2 3, 1-3, "
"^4)"
Expand Down Expand Up @@ -388,7 +388,7 @@ msgid "Packages not in AUR:"
msgstr "Pakete nicht im AUR:"

#: pkg/menus/clean_menu.go:54
msgid "Packages to cleanBuild?"
msgid "Packages to clean build?"
msgstr "Pakete neu erstellen?"

#: pkg/dep/dep_graph.go:202
Expand Down Expand Up @@ -636,7 +636,7 @@ msgid "failed to read config file '%s': %s"
msgstr "Fehler beim Lesen der Konfigurationsdatei '%s': %s"

#: pkg/cmd/graph/main.go:46 pkg/runtime/runtime.go:73
msgid "failed to retrieve aur Cache"
msgid "failed to retrieve AUR cache"
msgstr "Erhalten des AUR Caches ist fehlgeschlagen"

#: pkg/upgrade/sources.go:27
Expand Down
6 changes: 3 additions & 3 deletions po/en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ msgid " there is nothing to do"
msgstr ""

#: pkg/menus/menu.go:49
msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)"
msgid "%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)"
msgstr ""

#: pkg/sync/build/installer.go:308
Expand Down Expand Up @@ -361,7 +361,7 @@ msgid "Packages not in AUR:"
msgstr ""

#: pkg/menus/clean_menu.go:54
msgid "Packages to cleanBuild?"
msgid "Packages to clean build?"
msgstr ""

#: pkg/dep/dep_graph.go:202
Expand Down Expand Up @@ -621,7 +621,7 @@ msgstr ""

#: pkg/cmd/graph/main.go:46
#: pkg/runtime/runtime.go:73
msgid "failed to retrieve aur Cache"
msgid "failed to retrieve AUR cache"
msgstr ""

#: pkg/upgrade/sources.go:27
Expand Down
6 changes: 3 additions & 3 deletions po/es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ msgid " there is nothing to do"
msgstr " no hay nada que hacer"

#: pkg/menus/menu.go:49
msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)"
msgid "%s [A]ll [Ab]ort [I]nstalled [No]t Installed or (1 2 3, 1-3, ^4)"
msgstr "%s [A]Todos [Ab]ortar [I]nstalados [No]Instalados o (1 2 3, 1-3, ^4)"

#: pkg/sync/build/installer.go:308
Expand Down Expand Up @@ -383,7 +383,7 @@ msgid "Packages not in AUR:"
msgstr "Paquetes que no están en el AUR:"

#: pkg/menus/clean_menu.go:54
msgid "Packages to cleanBuild?"
msgid "Packages to clean build?"
msgstr "¿Paquetes a limpiar antes de compilar?"

#: pkg/dep/dep_graph.go:202
Expand Down Expand Up @@ -635,7 +635,7 @@ msgid "failed to read config file '%s': %s"
msgstr "no se pudo al leer archivo de configuración «%s»: %s"

#: pkg/cmd/graph/main.go:46 pkg/runtime/runtime.go:73
msgid "failed to retrieve aur Cache"
msgid "failed to retrieve AUR cache"
msgstr "no se pudo recuperar el aur Cache"

#: pkg/upgrade/sources.go:27
Expand Down
Loading