From 1c77ae0edd8359c2186071e70fa382bc2b70be1a Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Wed, 4 Oct 2023 13:34:32 +0200 Subject: [PATCH 01/11] introduce --any-candidate which picks the first candidate instead of presenting options with fzf --- README.md | 7 ++++++ bin/downgrade | 7 ++++++ completion/downgrade/zsh | 1 + doc/downgrade.8.md | 5 ++++ locale/downgrade.pot | 48 +++++++++++++++++++++------------------ locale/downgrade/cs.po | 48 +++++++++++++++++++++------------------ locale/downgrade/es.po | 48 +++++++++++++++++++++------------------ locale/downgrade/fr.po | 48 +++++++++++++++++++++------------------ locale/downgrade/lt.po | 48 +++++++++++++++++++++------------------ locale/downgrade/nb.po | 48 +++++++++++++++++++++------------------ locale/downgrade/nn.po | 48 +++++++++++++++++++++------------------ locale/downgrade/pl.po | 48 +++++++++++++++++++++------------------ locale/downgrade/pt_BR.po | 48 +++++++++++++++++++++------------------ locale/downgrade/ru.po | 48 +++++++++++++++++++++------------------ locale/downgrade/zh_CN.po | 48 +++++++++++++++++++++------------------ 15 files changed, 306 insertions(+), 242 deletions(-) diff --git a/README.md b/README.md index b1796b8..bf8510c 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ Options: --cached-only only use cached packages --ignore whether to add packages to IgnorePkg + --any-candidate never prompt for version or location, just pick any candidate --version show downgrade version -h, --help show help script @@ -78,6 +79,12 @@ Downgrade a package, looking in only the A.L.A.: # downgrade --ala-only foo ``` +Noninteractively downgrade foo to 1.0.0-1 + +``` +# downgrade --any-candidate --ignore never 'foo=1.0.0-1' +``` + ## Configuration Command-line options can be set persistently in diff --git a/bin/downgrade b/bin/downgrade index d063745..23d9b88 100755 --- a/bin/downgrade +++ b/bin/downgrade @@ -27,6 +27,7 @@ $(gettext "Options"): --cached-only $(gettext "only use cached packages") --ignore $(gettext "whether to add packages to IgnorePkg") + --any-candidate $(gettext "never prompt for version or location, just pick any candidate") --version $(gettext "show downgrade version") -h, --help $(gettext "show help script") @@ -290,6 +291,8 @@ process_term() { } >&2 elif (("${#candidates[@]}" == 1)); then choice=${candidates[0]} + elif ((DOWNGRADE_TO_ANY)); then + choice=${candidates[0]} else choice=$(present_packages "$name" "${candidates[@]}" | fzf --tac --border --header-lines 1 --tiebreak=begin | @@ -431,6 +434,9 @@ parse_options() { exit 1 fi ;; + --any-candidate) + DOWNGRADE_TO_ANY=1 + ;; --) shift pacman_args=("$@") @@ -492,6 +498,7 @@ DOWNGRADE_MAXDEPTH=1 DOWNGRADE_CONF="/etc/xdg/downgrade/downgrade.conf" DOWNGRADE_VERSION="11.3.0" DOWNGRADE_IGNORE="prompt" +DOWNGRADE_TO_ANY=0 # Main code execution if ((!LIB)); then diff --git a/completion/downgrade/zsh b/completion/downgrade/zsh index cb5d741..d6aa3cf 100644 --- a/completion/downgrade/zsh +++ b/completion/downgrade/zsh @@ -25,6 +25,7 @@ _downgrade () { '--ala-only[only use ALA server]' \ '--cached-only[only use cached packages]' \ '--ignore[whether to add packages to IgnorePkg]:action:(prompt always never)' \ + '--any-candidate[choose the first match]' \ '--version[show downgrade version]' \ {-h,--help}'[show help script]' \ '*:packages:->pkg' diff --git a/doc/downgrade.8.md b/doc/downgrade.8.md index 7001673..a3437cf 100644 --- a/doc/downgrade.8.md +++ b/doc/downgrade.8.md @@ -91,6 +91,11 @@ on the ALA. > Whether to add packages to IgnorePkg, default is _prompt_. +**\--any-candidate**\ + +> Never prompt for version or location, just pick any candidate. Allows for +> noninteractive downgrades when used in conjunction with --ignore + **\--version**\ > Show downgrade version. diff --git a/locale/downgrade.pot b/locale/downgrade.pot index 2b61026..fbbca23 100644 --- a/locale/downgrade.pot +++ b/locale/downgrade.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,92 +85,96 @@ msgid "whether to add packages to IgnorePkg" msgstr "" #: bin/downgrade:30 -msgid "show downgrade version" +msgid "never prompt for version or location, just pick any candidate" msgstr "" #: bin/downgrade:31 +msgid "show downgrade version" +msgstr "" + +#: bin/downgrade:32 msgid "show help script" msgstr "" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "" -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "" -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "" -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "" -#: bin/downgrade:427 +#: bin/downgrade:430 msgid "Missing or wrong --ignore argument" msgstr "" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "" diff --git a/locale/downgrade/cs.po b/locale/downgrade/cs.po index d6ea735..8a039f3 100644 --- a/locale/downgrade/cs.po +++ b/locale/downgrade/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 21:10+0100\n" "Last-Translator: , \n" "Language-Team: Czech\n" @@ -89,94 +89,98 @@ msgid "whether to add packages to IgnorePkg" msgstr "přidat $pkg mezi ignorované? [a/N] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "zobrazit downgrade verzi" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "zobrazit skript nápovědy" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Poznámka" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "Možnosti za znaky -- budou považovány za možnosti pacmanu." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "Pro více informací vizte downgrade(8)" -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Dostupné balíčky" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "přidat $pkg mezi ignorované? [a/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "a" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "vzdálený" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "Nebyly nalezeny žádné výsledky" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Neplatná volba" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "Nelze downgradovat $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Chybí argument --pacman" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Chybí argument --pacman-conf" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Chybí argument --ala-url" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Chybí argument --pacman-cache" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Chybí argument --pacman-log" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Chybí argument --maxdepth" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Chybí argument --pacman" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Nerozpoznaná možnost $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "Pro downgradování nebyly poskytnuty žádné balíčky" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade musí být spuštěn jako root" diff --git a/locale/downgrade/es.po b/locale/downgrade/es.po index 40ebc3e..6396ef0 100644 --- a/locale/downgrade/es.po +++ b/locale/downgrade/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 18:01-0400\n" "Last-Translator: , \n" "Language-Team: Spanish\n" @@ -87,96 +87,100 @@ msgid "whether to add packages to IgnorePkg" msgstr "Añadir $pkg a paquetes ignorados [s/N] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "mostrar la versión downgrade" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "mostrar guión de ayuda" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Nota" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Las opciones después de los caracteres -- se tratarán como opciones de " "pacman." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "Ver downgrade(8) para más detalles." -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Paquetes disponibles" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "Añadir $pkg a paquetes ignorados [s/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "s" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "remoto" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "No se han encontrado resultados" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Elección inválida" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "No se puede degradar $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Falta el argumento --pacman" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Falta el argumento --pacman-conf" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Falta el argumento --ala-url" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Falta el argumento --pacman-cache" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Falta el argumento --pacman-log" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Falta el argumento --maxdepth" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Falta el argumento --pacman" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Opción no reconocida $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "No se proporcionan paquetes para degradar" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade debe ejecutarse como root" diff --git a/locale/downgrade/fr.po b/locale/downgrade/fr.po index 92d3309..17c4953 100644 --- a/locale/downgrade/fr.po +++ b/locale/downgrade/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 12:56-0400\n" "Last-Translator: , \n" "Language-Team: French\n" @@ -91,97 +91,101 @@ msgstr "" "automatiquement ? [o/N] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "afficher la version downgrade" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "afficher le script d'aide" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Remarque" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Les options après les caractères -- seront traitées comme des options pacman." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "Voir downgrade(8) pour plus de détails." -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Paquets disponibles" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "" "Ajouter $pkg dans la liste des paquets à ne pas mettre à jour " "automatiquement ? [o/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "o" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "distant" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "Aucun résultat trouvé" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Choix invalide" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "Impossible de rétrograder $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Argument --pacman manquant" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Argument --pacman-conf manquant" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Argument --ala-url manquant" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Argument --pacman-cache manquant" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Argument --pacman-log manquant" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Argument --maxdepth manquant" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Argument --pacman manquant" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Option non reconnue $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "Aucun package fourni pour la rétrogradation" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "le downgrade doit être exécuté en tant que root" diff --git a/locale/downgrade/lt.po b/locale/downgrade/lt.po index c2a7307..148324a 100644 --- a/locale/downgrade/lt.po +++ b/locale/downgrade/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 13:53+0200\n" "Last-Translator: Algimantas Margevičius , " "\n" @@ -92,94 +92,98 @@ msgid "whether to add packages to IgnorePkg" msgstr "pridėti $pkg į IgnorePkg? [t/N] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "rodyti downgrade versiją" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "rodyti pagalbos scenarijų" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Pastaba" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "Parinktys po simbolių -- bus traktuojamos kaip pacman parinktys." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "Išsamiau galite paskaityti downgrade(8)." -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Prieinami paketai" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "pridėti $pkg į IgnorePkg? [t/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "t" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "nutolęs" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "Nieko nerasta" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Netinkamas pasirinkimas" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "Neįmanoma paversti žemesnio lygio $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Trūksta argumento --pacman" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Trūksta argumento --pacman-conf" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Trūksta argumento --ala-url" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Trūksta argumento --pacman-cache" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Trūksta argumento --pacman-log" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Trūksta argumento --maxdepth" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Trūksta argumento --pacman" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Neatpažinta parinktis $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "Nepateikta jokių pakuočių, leidžiančių pažengti žemiau" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade turi būti paleistas kaip root" diff --git a/locale/downgrade/nb.po b/locale/downgrade/nb.po index 9e8faa7..f4f5f49 100644 --- a/locale/downgrade/nb.po +++ b/locale/downgrade/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 12:48-0400\n" "Last-Translator: Håkon Vågsether , \n" @@ -88,95 +88,99 @@ msgid "whether to add packages to IgnorePkg" msgstr "legg til $pkg i IgnorePkg? [j/N] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "vis downgrade versjonen" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "vis hjelpeskript" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Merk" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Alternativer etter -- tegnene vil bli behandlet som pacman-alternativer." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "Se downgrade(8) for detaljer." -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Tilgjengelige pakker" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "legg til $pkg i IgnorePkg? [j/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "j" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "ekstern" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "Ingen resultater" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Ugyldig valg" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "Kan ikke nedgradere $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Mangler --pacman-conf -argumentet" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Mangler --ala-url -argumentet" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Mangler --pacman-cache -argumentet" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Mangler --pacman-log -argumentet" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Mangler --maxdepth -argumentet" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Ukjent alternativ $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "Ingen pakker gitt for nedgradering" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade må kjøres som root" diff --git a/locale/downgrade/nn.po b/locale/downgrade/nn.po index 963fda5..1cc5ce8 100644 --- a/locale/downgrade/nn.po +++ b/locale/downgrade/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 12:48-0400\n" "Last-Translator: Håkon Vågsether , \n" @@ -88,95 +88,99 @@ msgid "whether to add packages to IgnorePkg" msgstr "legg til $pkg i IgnorePkg? [j/N] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "vis downgrade versjonen" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "vis hjelpeskript" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Merk" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Alternativer etter -- tegnene vil bli behandlet som pacman-alternativer." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "Sjå downgrade(8) for detaljar." -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Tilgjengelege pakkar" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "legg til $pkg i IgnorePkg? [j/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "j" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "ekstern" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "Ingen resultater" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Ugyldig valg" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "Kan ikke nedgradere $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Mangler --pacman-conf -argumentet" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Mangler --ala-url -argumentet" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Mangler --pacman-cache -argumentet" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Mangler --pacman-log -argumentet" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Mangler --maxdepth -argumentet" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Ukjent alternativ $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "Ingen pakker gitt for nedgradering" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade må kjøres som root" diff --git a/locale/downgrade/pl.po b/locale/downgrade/pl.po index 6e8965b..91d2f8a 100644 --- a/locale/downgrade/pl.po +++ b/locale/downgrade/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 17:23+0200\n" "Last-Translator: Tomasz \"Ludvick\" Niedzielski , " "\n" @@ -91,94 +91,98 @@ msgid "whether to add packages to IgnorePkg" msgstr "dodać $pkg do IgnorePkg? [t/N] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "pokaż downgrade wersję" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "pokaż skrypt pomocy" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Uwaga" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "Opcje po znakach -- będą traktowane jako opcje Pacman." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "Zobacz downgrade(8) po szczegóły." -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Dostępne pakiety" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "dodać $pkg do IgnorePkg? [t/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "t" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "do pobrania" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "Nie znaleziono wyników" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Nieprawidłowy wybór" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "Nie można obniżyć poziomu $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Brak argumentu --pacman" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Brak argumentu --pacman-conf" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Brak argumentu --ala-url" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Brak argumentu --pacman-cache" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Brak argumentu --pacman-log" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Brak argumentu --maxdepth" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Brak argumentu --pacman" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Nierozpoznana opcja $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "Brak pakietów do obniżenia" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade musi być uruchamiany jako root" diff --git a/locale/downgrade/pt_BR.po b/locale/downgrade/pt_BR.po index d974e74..4ac43aa 100644 --- a/locale/downgrade/pt_BR.po +++ b/locale/downgrade/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 01:23-0300\n" "Last-Translator: Thiago Perrotta , \n" @@ -89,94 +89,98 @@ msgid "whether to add packages to IgnorePkg" msgstr "adicionar $pkg em IgnorePkg? [s/N] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "mostrar a versão downgrade" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "mostrar script de ajuda" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Nota" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "As opções após os caracteres -- serão tratadas como opções do pacman." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "Veja downgrade(8) para mais detalhes." -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Pacotes disponíveis" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "adicionar $pkg em IgnorePkg? [s/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "s" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "remoto" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "Nenhum resultado encontrado" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Escolha inválida" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "Não foi possível fazer o downgrade $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Argumento --pacman ausente" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Argumento --pacman-conf ausente" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Argumento --ala-url ausente" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Argumento --pacman-cache ausente" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Argumento --pacman-log ausente" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Argumento --maxdepth ausente" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Argumento --pacman ausente" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Opção não reconhecida $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "Nenhum pacote fornecido para desatualização" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade deve ser executado como root" diff --git a/locale/downgrade/ru.po b/locale/downgrade/ru.po index 38444bd..aaf03fb 100644 --- a/locale/downgrade/ru.po +++ b/locale/downgrade/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 14:25-0300\n" "Last-Translator: Nurlan , \n" "Language-Team: Russian\n" @@ -90,95 +90,99 @@ msgid "whether to add packages to IgnorePkg" msgstr "добавить $pkg в список проигнорированных пакетов? [д/Н] " #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "показать версию downgrade" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "показать скрипт помощи" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "Заметка" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Параметры после символов -- будут рассматриваться как параметры pacman." -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "см. downgrade(8) для подробностей." -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "Доступные пакеты" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "добавить $pkg в список проигнорированных пакетов? [д/Н] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "д" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "дистанционно" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "результаты не найдены" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "Неверный выбор" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "Невозможно понизить $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "Отсутствует аргумент --pacman" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "Отсутствует аргумент --pacman-conf" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "Отсутствует аргумент --ala-url" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "Отсутствует аргумент --pacman-cache" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "Отсутствует аргумент --pacman-log" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "Отсутствует аргумент --maxdepth" -#: bin/downgrade:427 +#: bin/downgrade:430 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Отсутствует аргумент --pacman" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "Нераспознанная опция $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "Нет пакетов для понижения" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade должен запускаться как root" diff --git a/locale/downgrade/zh_CN.po b/locale/downgrade/zh_CN.po index eeee50f..235af04 100644 --- a/locale/downgrade/zh_CN.po +++ b/locale/downgrade/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-27 20:57+0800\n" +"POT-Creation-Date: 2023-10-04 13:40+0200\n" "PO-Revision-Date: 2020-04-21 23:16+0800\n" "Last-Translator: , \n" "Language-Team: Chinese\n" @@ -86,93 +86,97 @@ msgid "whether to add packages to IgnorePkg" msgstr "是否添加软件包到 IgnorePkg" #: bin/downgrade:30 +msgid "never prompt for version or location, just pick any candidate" +msgstr "" + +#: bin/downgrade:31 msgid "show downgrade version" msgstr "显示 downgrade 版本" -#: bin/downgrade:31 +#: bin/downgrade:32 msgid "show help script" msgstr "显示帮助脚本" -#: bin/downgrade:33 +#: bin/downgrade:34 msgid "Note" msgstr "注意" -#: bin/downgrade:34 +#: bin/downgrade:35 msgid "Options after the -- characters will be treated as pacman options." msgstr "-- 字符后的选项将被视为 pacman 选项。" -#: bin/downgrade:35 +#: bin/downgrade:36 msgid "See downgrade(8) for details." msgstr "详情请查看 downgrade(8)。" -#: bin/downgrade:97 +#: bin/downgrade:98 msgid "Available packages" msgstr "可选的包" -#: bin/downgrade:127 +#: bin/downgrade:128 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "添加 $pkg 到 IgnorePkg? [y/N] " -#: bin/downgrade:129 +#: bin/downgrade:130 msgid "y" msgstr "y" -#: bin/downgrade:239 +#: bin/downgrade:240 msgid "remote" msgstr "远端" -#: bin/downgrade:288 +#: bin/downgrade:289 msgid "No results found" msgstr "未找到结果" -#: bin/downgrade:299 +#: bin/downgrade:302 msgid "Invalid choice" msgstr "选择无效" -#: bin/downgrade:312 +#: bin/downgrade:315 #, sh-format msgid "Unable to downgrade $name" msgstr "无法降级 $name" -#: bin/downgrade:341 +#: bin/downgrade:344 msgid "Missing --pacman argument" msgstr "缺少 --pacman 参数" -#: bin/downgrade:354 +#: bin/downgrade:357 msgid "Missing --pacman-conf argument" msgstr "缺少 --pacman-conf 参数" -#: bin/downgrade:367 +#: bin/downgrade:370 msgid "Missing --ala-url argument" msgstr "缺少 --ala-url 参数" -#: bin/downgrade:380 +#: bin/downgrade:383 msgid "Missing --pacman-cache argument" msgstr "缺少 --pacman-cache 参数" -#: bin/downgrade:393 +#: bin/downgrade:396 msgid "Missing --pacman-log argument" msgstr "缺少 --pacman-log 参数" -#: bin/downgrade:406 +#: bin/downgrade:409 msgid "Missing --maxdepth argument" msgstr "缺少 --maxdepth 参数" -#: bin/downgrade:427 +#: bin/downgrade:430 msgid "Missing or wrong --ignore argument" msgstr "--pacman 参数缺失或有误" -#: bin/downgrade:444 +#: bin/downgrade:450 #, sh-format msgid "Unrecognized option $current_option" msgstr "无法识别的选项 $current_option" -#: bin/downgrade:459 +#: bin/downgrade:465 msgid "No packages provided for downgrading" msgstr "没有提供降级包" -#: bin/downgrade:526 +#: bin/downgrade:533 msgid "downgrade must be run as root" msgstr "downgrade 必须以 root 身份运行" From d82aa216c1698f92e8409552fea0eb84910bb6d6 Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Wed, 4 Oct 2023 14:43:33 +0200 Subject: [PATCH 02/11] refrain from checking ala if DOWNGRADE_TO_ANY and candidates where found in cache splits search_packages() into search_ala() and search_cache() leading to changes in tests --- bin/downgrade | 45 ++++++++++++++--------- test/main/invalid-choice.t | 3 +- test/main/invalid-input.t | 3 +- test/main/no-candidates.t | 3 +- test/main/one-choice.t | 6 ++- test/main/success.t | 3 +- test/main/term_operator_version_parsing.t | 3 +- test/search_ala/ala.t | 8 ++-- test/search_ala/no-architecture.t | 2 +- test/search_ala/specific-version.t | 14 +++---- test/search_ala/uri-decoding.t | 4 +- test/search_cache/config-missing.t | 2 +- test/search_cache/pacman-conf-multiple.t | 2 +- test/search_cache/pacman-conf-single.t | 2 +- test/search_cache/specific-version.t | 14 +++---- 15 files changed, 66 insertions(+), 48 deletions(-) diff --git a/bin/downgrade b/bin/downgrade index 23d9b88..a7eddd2 100755 --- a/bin/downgrade +++ b/bin/downgrade @@ -181,31 +181,33 @@ matches_name_version_filter() { esac } -search_packages() { +search_ala() { local name=$1 pkgfile_re index pkgfile_re="$name-[^-]+-[0-9.]+-(any|$DOWNGRADE_ARCH)\\.pkg\\.tar\\.(gz|xz|zst)" index="$DOWNGRADE_ALA_URL/packages/${name:0:1}/$name/" - if ((DOWNGRADE_FROM_ALA)); then - curl --fail --silent "$index" | sed_msg "to parse A.L.A." -E ' - /.* href="('"$pkgfile_re"')".*/!d; - s||'"$index"'\1|g; s|\+| |g; s|%|\\x|g' | xargs -0 printf "%b" - fi + curl --fail --silent "$index" | sed_msg "to parse A.L.A." -E ' + /.* href="('"$pkgfile_re"')".*/!d; + s||'"$index"'\1|g; s|\+| |g; s|%|\\x|g' | xargs -0 printf "%b" +} - if ((DOWNGRADE_FROM_CACHE)); then - # Delay this defaulting so #read_pacman_conf behavior is tested - if ((!${#PACMAN_CACHE[@]})); then - mapfile -t PACMAN_CACHE < <(read_pacman_conf CacheDir) - fi +search_cache() { + local name=$1 pkgfile_re index - if ((!${#PACMAN_CACHE[@]})); then - PACMAN_CACHE=(/var/cache/pacman/pkg/) - fi + pkgfile_re="$name-[^-]+-[0-9.]+-(any|$DOWNGRADE_ARCH)\\.pkg\\.tar\\.(gz|xz|zst)" + + # Delay this defaulting so #read_pacman_conf behavior is tested + if ((!${#PACMAN_CACHE[@]})); then + mapfile -t PACMAN_CACHE < <(read_pacman_conf CacheDir) + fi - # shellcheck disable=SC2086 - find -L "${PACMAN_CACHE[@]}" -maxdepth "$DOWNGRADE_MAXDEPTH" -regextype posix-extended -regex ".*/$pkgfile_re" + if ((!${#PACMAN_CACHE[@]})); then + PACMAN_CACHE=(/var/cache/pacman/pkg/) fi + + # shellcheck disable=SC2086 + find -L "${PACMAN_CACHE[@]}" -maxdepth "$DOWNGRADE_MAXDEPTH" -regextype posix-extended -regex ".*/$pkgfile_re" } sort_packages() { @@ -282,7 +284,16 @@ process_term() { installed=($(previously_installed "$name")) current=$(currently_installed "$name") - candidates=($(search_packages "$name" | filter_packages "$name" "$operator" "$version" | sort_packages)) + + candidates=() + if ((DOWNGRADE_FROM_CACHE)); then + candidates+=($(search_cache "$name" | filter_packages "$name" "$operator" "$version" | sort_packages)) + fi + if ((DOWNGRADE_FROM_ALA)); then + if ((DOWNGRADE_TO_ANY == 0)) || (("${#candidates[@]}" == 0)); then + candidates+=($(search_ala "$name" | filter_packages "$name" "$operator" "$version" | sort_packages)) + fi + fi if (("${#candidates[@]}" == 0)); then { diff --git a/test/main/invalid-choice.t b/test/main/invalid-choice.t index 8332c7c..769db96 100644 --- a/test/main/invalid-choice.t +++ b/test/main/invalid-choice.t @@ -3,7 +3,8 @@ It does nothing on an invalid choice - $ search_packages() { printf "%s\n" foo foo foo; } + $ search_ala() { printf "%s\n" foo foo foo; } + > search_cache() { :; } > main foo < <(echo -1) 2>/dev/null; exit_code=$? > echo > printf "ignore: %s\n" "${to_ignore[@]}" diff --git a/test/main/invalid-input.t b/test/main/invalid-input.t index 698e6f2..c5345ca 100644 --- a/test/main/invalid-input.t +++ b/test/main/invalid-input.t @@ -15,7 +15,8 @@ It returns error messages given invalid input install: exit code: 1 - $ search_packages() { :; } + $ search_ala() { :; } + > search_cache() { :; } > main 'foo/bar'; exit_code=$? > printf "ignore: %s\n" "${to_ignore[@]}" > printf "install: %s\n" "${to_install[@]}" diff --git a/test/main/no-candidates.t b/test/main/no-candidates.t index e6fe657..2fae003 100644 --- a/test/main/no-candidates.t +++ b/test/main/no-candidates.t @@ -3,7 +3,8 @@ It does nothing if there are no candidates - $ search_packages() { :; } + $ search_ala() { :; } + > search_cache() { :; } > main foo 2>/dev/null; exit_code=$? > printf "ignore: %s\n" "${to_ignore[@]}" > printf "install: %s\n" "${to_install[@]}" diff --git a/test/main/one-choice.t b/test/main/one-choice.t index 9c5eb59..b7ced91 100644 --- a/test/main/one-choice.t +++ b/test/main/one-choice.t @@ -4,8 +4,10 @@ It doesn't present packages when there's only one choice $ touch "$TMP/foo.pkg" - > search_packages() { printf "%s\n" "$TMP/foo.pkg"; } - > main foo 2>/dev/null; exit_code=$? + > DOWNGRADE_IGNORE=always + > DOWNGRADE_FROM_CACHE=1 + > search_cache() { printf "%s\n" "$TMP/foo.pkg"; } + > main foo 2>/tmp/downgradechoicelog; exit_code=$? > printf "ignore: %s\n" "${to_ignore[@]}" > printf "install: %s\n" "${to_install[@]}" > printf "exit code: %s\n" "$exit_code" diff --git a/test/main/success.t b/test/main/success.t index 54bed18..8a17d25 100644 --- a/test/main/success.t +++ b/test/main/success.t @@ -4,7 +4,8 @@ It adds the term and package to global arrays if successful $ touch "$TMP/foo.pkg" "$TMP/foo.pkg" - > search_packages() { printf "%s\n" "$TMP/foo.pkg" "$TMP/foo.pkg"; } + > DOWNGRADE_FROM_CACHE=1 + > search_cache() { printf "%s\n" "$TMP/foo.pkg" "$TMP/foo.pkg"; } > FZF_CHOICE=1 > main foo 2>/dev/null; exit_code=$? > echo diff --git a/test/main/term_operator_version_parsing.t b/test/main/term_operator_version_parsing.t index 8ca9b61..092106b 100644 --- a/test/main/term_operator_version_parsing.t +++ b/test/main/term_operator_version_parsing.t @@ -4,7 +4,8 @@ Check if package name, operator and version can be separated $ touch "$TMP/foo.pkg" - > search_packages() { printf "%s\n" "$TMP/foo.pkg"; } + > DOWNGRADE_FROM_CACHE=1 + > search_cache() { printf "%s\n" "$TMP/foo.pkg"; } > filter_packages() { echo "$*" >&2; cat; } > main "foo=1.0.0-1" "foo==1.0.0-1" "foo=~^1.0" > main "bar<=1.0.0-1" "baz>=1.0.0-1" "bat<1.0.0-1" "bam>1.0.0-1" diff --git a/test/search_ala/ala.t b/test/search_ala/ala.t index 411799a..3fff0a5 100644 --- a/test/search_ala/ala.t +++ b/test/search_ala/ala.t @@ -4,7 +4,7 @@ Searching the A.L.A. $ DOWNGRADE_ARCH=x86_64 > DOWNGRADE_FROM_ALA=1 - > search_packages 'xorg-twm' + > search_ala 'xorg-twm' https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.7-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-2-x86_64.pkg.tar.xz @@ -14,7 +14,7 @@ Searching the A.L.A. $ DOWNGRADE_ARCH=i486 > DOWNGRADE_ALA_URL="https://archive.archlinux32.org" > DOWNGRADE_FROM_ALA=1 - > search_packages 'xorg-twm' + > search_ala 'xorg-twm' https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.10-1.2-i486.pkg.tar.xz https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.10-2.0-i486.pkg.tar.zst https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.11-1.0-i486.pkg.tar.zst @@ -22,7 +22,7 @@ Searching the A.L.A. $ DOWNGRADE_ARCH=i686 > DOWNGRADE_ALA_URL="https://archive.archlinux32.org" > DOWNGRADE_FROM_ALA=1 - > search_packages 'xorg-twm' + > search_ala 'xorg-twm' https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.9-1-i686.pkg.tar.xz https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.10-1.0-i686.pkg.tar.xz https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.10-1.1-i686.pkg.tar.xz @@ -34,7 +34,7 @@ Searching the A.L.A. $ DOWNGRADE_ARCH=pentium4 > DOWNGRADE_ALA_URL="https://archive.archlinux32.org" > DOWNGRADE_FROM_ALA=1 - > search_packages 'xorg-twm' + > search_ala 'xorg-twm' https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.10-1.2-pentium4.pkg.tar.xz https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.10-1.3-pentium4.pkg.tar.xz https://archive.archlinux32.org/packages/x/xorg-twm/xorg-twm-1.0.10-2.0-pentium4.pkg.tar.zst diff --git a/test/search_ala/no-architecture.t b/test/search_ala/no-architecture.t index 9dfb7d0..dd1e22b 100644 --- a/test/search_ala/no-architecture.t +++ b/test/search_ala/no-architecture.t @@ -2,7 +2,7 @@ Searching the A.L.A. for -any packages - $ DOWNGRADE_FROM_ALA=1 search_packages 'ansible' + $ DOWNGRADE_FROM_ALA=1 search_ala 'ansible' https://archive.archlinux.org/packages/a/ansible/ansible-1.4.4-4-any.pkg.tar.xz https://archive.archlinux.org/packages/a/ansible/ansible-1.4.5-1-any.pkg.tar.xz https://archive.archlinux.org/packages/a/ansible/ansible-1.5-1-any.pkg.tar.xz diff --git a/test/search_ala/specific-version.t b/test/search_ala/specific-version.t index 7c73a53..63aafb6 100644 --- a/test/search_ala/specific-version.t +++ b/test/search_ala/specific-version.t @@ -4,37 +4,37 @@ Searching the A.L.A. for specific version $ DOWNGRADE_ARCH=x86_64 > DOWNGRADE_FROM_ALA=1 - > search_packages 'xorg-twm' | filter_packages 'xorg-twm' '=' '1.0.8-1' + > search_ala 'xorg-twm' | filter_packages 'xorg-twm' '=' '1.0.8-1' https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-1-x86_64.pkg.tar.xz $ DOWNGRADE_ARCH=x86_64 > DOWNGRADE_FROM_ALA=1 - > search_packages 'xorg-twm' | filter_packages 'xorg-twm' '==' '1.0.8-1' + > search_ala 'xorg-twm' | filter_packages 'xorg-twm' '==' '1.0.8-1' https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-1-x86_64.pkg.tar.xz - $ search_packages 'xorg-twm' | filter_packages 'xorg-twm' '=~' '1.0.8' + $ search_ala 'xorg-twm' | filter_packages 'xorg-twm' '=~' '1.0.8' https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-3-x86_64.pkg.tar.xz - $ search_packages 'xorg-twm' | filter_packages 'xorg-twm' '>=' '1.0.8-1' + $ search_ala 'xorg-twm' | filter_packages 'xorg-twm' '>=' '1.0.8-1' https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-3-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.9-1-x86_64.pkg.tar.xz - $ search_packages 'xorg-twm' | filter_packages 'xorg-twm' '<=' '1.0.8-3' + $ search_ala 'xorg-twm' | filter_packages 'xorg-twm' '<=' '1.0.8-3' https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.7-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-3-x86_64.pkg.tar.xz - $ search_packages 'xorg-twm' | filter_packages 'xorg-twm' '>' '1.0.8-1' + $ search_ala 'xorg-twm' | filter_packages 'xorg-twm' '>' '1.0.8-1' https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-3-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.9-1-x86_64.pkg.tar.xz - $ search_packages 'xorg-twm' | filter_packages 'xorg-twm' '<' '1.0.8-3' + $ search_ala 'xorg-twm' | filter_packages 'xorg-twm' '<' '1.0.8-3' https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.7-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/x/xorg-twm/xorg-twm-1.0.8-2-x86_64.pkg.tar.xz diff --git a/test/search_ala/uri-decoding.t b/test/search_ala/uri-decoding.t index 336b898..bbccabf 100644 --- a/test/search_ala/uri-decoding.t +++ b/test/search_ala/uri-decoding.t @@ -2,7 +2,7 @@ URL decoding packages - $ DOWNGRADE_FROM_ALA=1 search_packages 'python-setuptools' | sort -rV + $ DOWNGRADE_FROM_ALA=1 search_ala 'python-setuptools' | sort -rV https://archive.archlinux.org/packages/p/python-setuptools/python-setuptools-4.0.1-1-any.pkg.tar.xz https://archive.archlinux.org/packages/p/python-setuptools/python-setuptools-4.0-1-any.pkg.tar.xz https://archive.archlinux.org/packages/p/python-setuptools/python-setuptools-3.6-1-any.pkg.tar.xz @@ -114,7 +114,7 @@ URL decoding packages Regression 1 - $ DOWNGRADE_FROM_ALA=1 search_packages 'cairo' + $ DOWNGRADE_FROM_ALA=1 search_ala 'cairo' https://archive.archlinux.org/packages/c/cairo/cairo-1.16.0-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/c/cairo/cairo-1.17.2+17+g52a7c79fd-1-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/c/cairo/cairo-1.17.2+17+g52a7c79fd-2-x86_64.pkg.tar.xz diff --git a/test/search_cache/config-missing.t b/test/search_cache/config-missing.t index 7a4e116..56ce356 100644 --- a/test/search_cache/config-missing.t +++ b/test/search_cache/config-missing.t @@ -11,6 +11,6 @@ With no config option set > "$PACMAN_CACHE/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf > DOWNGRADE_FROM_CACHE=1 - > search_packages 'foo' | filter_packages 'foo' '=~' '^1' | sort + > search_cache 'foo' | filter_packages 'foo' '=~' '^1' | sort /tmp/*/foo-1.0-1-any.pkg.tar.gz (glob) /tmp/*/foo-1.1-1-any.pkg.tar.gz (glob) diff --git a/test/search_cache/pacman-conf-multiple.t b/test/search_cache/pacman-conf-multiple.t index 8ec983c..94e2803 100644 --- a/test/search_cache/pacman-conf-multiple.t +++ b/test/search_cache/pacman-conf-multiple.t @@ -12,7 +12,7 @@ From multiple directories > write_pacman_conf \ > "CacheDir = $cache_1/" \ > "CacheDir = $cache_2/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | cut -d . -f 3- | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | cut -d . -f 3- | sort 1/foo-1.0-1-any.pkg.tar.gz (glob) 1/foo-3.5-1-any.pkg.tar.xz (glob) 2/foo-1.1-1-any.pkg.tar.gz (glob) diff --git a/test/search_cache/pacman-conf-single.t b/test/search_cache/pacman-conf-single.t index 6808ed9..e74d8fc 100644 --- a/test/search_cache/pacman-conf-single.t +++ b/test/search_cache/pacman-conf-single.t @@ -10,7 +10,7 @@ From a single directory > "$cache/foo-1.1-1-any.pkg.tar.gz" \ > "$cache/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf "CacheDir = $cache/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | sort /tmp/*/foo-1.0-1-any.pkg.tar.gz (glob) /tmp/*/foo-1.1-1-any.pkg.tar.gz (glob) /tmp/*/foo-2.0-1-any.pkg.tar.gz (glob) diff --git a/test/search_cache/specific-version.t b/test/search_cache/specific-version.t index 6b8f046..9044858 100644 --- a/test/search_cache/specific-version.t +++ b/test/search_cache/specific-version.t @@ -10,7 +10,7 @@ With a version string included > "$cache/foo-1.1-1-any.pkg.tar.gz" \ > "$cache/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf "CacheDir = $cache/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | filter_packages 'foo' '=~' '^1' | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | filter_packages 'foo' '=~' '^1' | sort /tmp/*/foo-1.0-1-any.pkg.tar.gz (glob) /tmp/*/foo-1.1-1-any.pkg.tar.gz (glob) @@ -22,7 +22,7 @@ With a version string included > "$cache/foo-1.1-1-any.pkg.tar.gz" \ > "$cache/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf "CacheDir = $cache/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | filter_packages 'foo' '=' '1.1-1' | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | filter_packages 'foo' '=' '1.1-1' | sort /tmp/*/foo-1.1-1-any.pkg.tar.gz (glob) $ cache=$(mktemp -d) @@ -33,7 +33,7 @@ With a version string included > "$cache/foo-1.1-1-any.pkg.tar.gz" \ > "$cache/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf "CacheDir = $cache/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | filter_packages 'foo' '==' '1.1-1' | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | filter_packages 'foo' '==' '1.1-1' | sort /tmp/*/foo-1.1-1-any.pkg.tar.gz (glob) $ cache=$(mktemp -d) @@ -44,7 +44,7 @@ With a version string included > "$cache/foo-1.1-1-any.pkg.tar.gz" \ > "$cache/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf "CacheDir = $cache/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | filter_packages 'foo' '>=' '2.0-1' | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | filter_packages 'foo' '>=' '2.0-1' | sort /tmp/*/foo-2.0-1-any.pkg.tar.gz (glob) /tmp/*/foo-3.5-1-any.pkg.tar.xz (glob) @@ -56,7 +56,7 @@ With a version string included > "$cache/foo-1.1-1-any.pkg.tar.gz" \ > "$cache/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf "CacheDir = $cache/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | filter_packages 'foo' '<=' '2.0-1' | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | filter_packages 'foo' '<=' '2.0-1' | sort /tmp/*/foo-1.0-1-any.pkg.tar.gz (glob) /tmp/*/foo-1.1-1-any.pkg.tar.gz (glob) /tmp/*/foo-2.0-1-any.pkg.tar.gz (glob) @@ -69,7 +69,7 @@ With a version string included > "$cache/foo-1.1-1-any.pkg.tar.gz" \ > "$cache/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf "CacheDir = $cache/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | filter_packages 'foo' '>' '2.0-1' | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | filter_packages 'foo' '>' '2.0-1' | sort /tmp/*/foo-3.5-1-any.pkg.tar.xz (glob) $ cache=$(mktemp -d) @@ -80,6 +80,6 @@ With a version string included > "$cache/foo-1.1-1-any.pkg.tar.gz" \ > "$cache/foo-completions-1.1-1-any.pkg.tar.gz" > write_pacman_conf "CacheDir = $cache/" - > DOWNGRADE_FROM_CACHE=1 search_packages 'foo' | filter_packages 'foo' '<' '2.0-1' | sort + > DOWNGRADE_FROM_CACHE=1 search_cache 'foo' | filter_packages 'foo' '<' '2.0-1' | sort /tmp/*/foo-1.0-1-any.pkg.tar.gz (glob) /tmp/*/foo-1.1-1-any.pkg.tar.gz (glob) From b1ff80855718d3b6d71123e13598c66cf3603f8c Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Wed, 4 Oct 2023 15:08:18 +0200 Subject: [PATCH 03/11] make --any-candidate pick the latest version --- bin/downgrade | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/downgrade b/bin/downgrade index a7eddd2..ec5c3fc 100755 --- a/bin/downgrade +++ b/bin/downgrade @@ -287,14 +287,16 @@ process_term() { candidates=() if ((DOWNGRADE_FROM_CACHE)); then - candidates+=($(search_cache "$name" | filter_packages "$name" "$operator" "$version" | sort_packages)) + candidates+=($(search_cache "$name" | filter_packages "$name" "$operator" "$version")) fi if ((DOWNGRADE_FROM_ALA)); then if ((DOWNGRADE_TO_ANY == 0)) || (("${#candidates[@]}" == 0)); then - candidates+=($(search_ala "$name" | filter_packages "$name" "$operator" "$version" | sort_packages)) + candidates=($(search_ala "$name" | filter_packages "$name" "$operator" "$version") "${candidates[@]}") fi fi + candidates=($(printf '%s\n' "${candidates[@]}" | sort_packages)) + if (("${#candidates[@]}" == 0)); then { gettext "No results found" @@ -303,7 +305,8 @@ process_term() { elif (("${#candidates[@]}" == 1)); then choice=${candidates[0]} elif ((DOWNGRADE_TO_ANY)); then - choice=${candidates[0]} + # Select the most up to date package + choice=${candidates[-1]} else choice=$(present_packages "$name" "${candidates[@]}" | fzf --tac --border --header-lines 1 --tiebreak=begin | From f03765f9e0108fbd92348014caa13f424cbed1f3 Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Wed, 4 Oct 2023 15:16:39 +0200 Subject: [PATCH 04/11] document how --any-candidate selects the package --- README.md | 2 +- bin/downgrade | 2 +- completion/downgrade/zsh | 2 +- doc/downgrade.8.md | 5 ++++- locale/downgrade.pot | 32 ++++++++++++++++---------------- locale/downgrade/cs.po | 32 ++++++++++++++++---------------- locale/downgrade/es.po | 32 ++++++++++++++++---------------- locale/downgrade/fr.po | 32 ++++++++++++++++---------------- locale/downgrade/lt.po | 32 ++++++++++++++++---------------- locale/downgrade/nb.po | 32 ++++++++++++++++---------------- locale/downgrade/nn.po | 32 ++++++++++++++++---------------- locale/downgrade/pl.po | 32 ++++++++++++++++---------------- locale/downgrade/pt_BR.po | 32 ++++++++++++++++---------------- locale/downgrade/ru.po | 32 ++++++++++++++++---------------- locale/downgrade/zh_CN.po | 32 ++++++++++++++++---------------- 15 files changed, 183 insertions(+), 180 deletions(-) diff --git a/README.md b/README.md index bf8510c..84f0bfa 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Options: --cached-only only use cached packages --ignore whether to add packages to IgnorePkg - --any-candidate never prompt for version or location, just pick any candidate + --any-candidate never prompt for version or location, pick automatically instead --version show downgrade version -h, --help show help script diff --git a/bin/downgrade b/bin/downgrade index ec5c3fc..6adc6d0 100755 --- a/bin/downgrade +++ b/bin/downgrade @@ -27,7 +27,7 @@ $(gettext "Options"): --cached-only $(gettext "only use cached packages") --ignore $(gettext "whether to add packages to IgnorePkg") - --any-candidate $(gettext "never prompt for version or location, just pick any candidate") + --any-candidate $(gettext "never prompt for version or location, pick automatically instead") --version $(gettext "show downgrade version") -h, --help $(gettext "show help script") diff --git a/completion/downgrade/zsh b/completion/downgrade/zsh index d6aa3cf..d545d92 100644 --- a/completion/downgrade/zsh +++ b/completion/downgrade/zsh @@ -25,7 +25,7 @@ _downgrade () { '--ala-only[only use ALA server]' \ '--cached-only[only use cached packages]' \ '--ignore[whether to add packages to IgnorePkg]:action:(prompt always never)' \ - '--any-candidate[choose the first match]' \ + '--any-candidate[automatic package selection]' \ '--version[show downgrade version]' \ {-h,--help}'[show help script]' \ '*:packages:->pkg' diff --git a/doc/downgrade.8.md b/doc/downgrade.8.md index a3437cf..e942087 100644 --- a/doc/downgrade.8.md +++ b/doc/downgrade.8.md @@ -93,8 +93,11 @@ on the ALA. **\--any-candidate**\ -> Never prompt for version or location, just pick any candidate. Allows for +> Never prompt for version or location, pick automatically instead. Allows for > noninteractive downgrades when used in conjunction with --ignore +> If a package matching the version filter is found in the cache, pick the +> latest matching version from cache. Íf no matches are found in cache or +> --ala-only was specified, then pick the latest matching version from ala. **\--version**\ diff --git a/locale/downgrade.pot b/locale/downgrade.pot index fbbca23..507036c 100644 --- a/locale/downgrade.pot +++ b/locale/downgrade.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,7 +85,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "" #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -121,60 +121,60 @@ msgstr "" msgid "y" msgstr "" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "" -#: bin/downgrade:430 +#: bin/downgrade:444 msgid "Missing or wrong --ignore argument" msgstr "" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "" diff --git a/locale/downgrade/cs.po b/locale/downgrade/cs.po index 8a039f3..5adbfcd 100644 --- a/locale/downgrade/cs.po +++ b/locale/downgrade/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 21:10+0100\n" "Last-Translator: , \n" "Language-Team: Czech\n" @@ -89,7 +89,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "přidat $pkg mezi ignorované? [a/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -125,62 +125,62 @@ msgstr "přidat $pkg mezi ignorované? [a/N] " msgid "y" msgstr "a" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "vzdálený" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "Nebyly nalezeny žádné výsledky" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Neplatná volba" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "Nelze downgradovat $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Chybí argument --pacman" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Chybí argument --pacman-conf" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Chybí argument --ala-url" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Chybí argument --pacman-cache" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Chybí argument --pacman-log" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Chybí argument --maxdepth" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Chybí argument --pacman" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Nerozpoznaná možnost $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "Pro downgradování nebyly poskytnuty žádné balíčky" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade musí být spuštěn jako root" diff --git a/locale/downgrade/es.po b/locale/downgrade/es.po index 6396ef0..2ba8e8e 100644 --- a/locale/downgrade/es.po +++ b/locale/downgrade/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 18:01-0400\n" "Last-Translator: , \n" "Language-Team: Spanish\n" @@ -87,7 +87,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "Añadir $pkg a paquetes ignorados [s/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -125,62 +125,62 @@ msgstr "Añadir $pkg a paquetes ignorados [s/N] " msgid "y" msgstr "s" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "remoto" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "No se han encontrado resultados" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Elección inválida" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "No se puede degradar $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Falta el argumento --pacman" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Falta el argumento --pacman-conf" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Falta el argumento --ala-url" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Falta el argumento --pacman-cache" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Falta el argumento --pacman-log" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Falta el argumento --maxdepth" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Falta el argumento --pacman" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Opción no reconocida $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "No se proporcionan paquetes para degradar" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade debe ejecutarse como root" diff --git a/locale/downgrade/fr.po b/locale/downgrade/fr.po index 17c4953..ef647cd 100644 --- a/locale/downgrade/fr.po +++ b/locale/downgrade/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 12:56-0400\n" "Last-Translator: , \n" "Language-Team: French\n" @@ -91,7 +91,7 @@ msgstr "" "automatiquement ? [o/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -130,62 +130,62 @@ msgstr "" msgid "y" msgstr "o" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "distant" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "Aucun résultat trouvé" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Choix invalide" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "Impossible de rétrograder $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Argument --pacman manquant" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Argument --pacman-conf manquant" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Argument --ala-url manquant" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Argument --pacman-cache manquant" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Argument --pacman-log manquant" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Argument --maxdepth manquant" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Argument --pacman manquant" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Option non reconnue $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "Aucun package fourni pour la rétrogradation" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "le downgrade doit être exécuté en tant que root" diff --git a/locale/downgrade/lt.po b/locale/downgrade/lt.po index 148324a..73998f0 100644 --- a/locale/downgrade/lt.po +++ b/locale/downgrade/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 13:53+0200\n" "Last-Translator: Algimantas Margevičius , " "\n" @@ -92,7 +92,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "pridėti $pkg į IgnorePkg? [t/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -128,62 +128,62 @@ msgstr "pridėti $pkg į IgnorePkg? [t/N] " msgid "y" msgstr "t" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "nutolęs" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "Nieko nerasta" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Netinkamas pasirinkimas" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "Neįmanoma paversti žemesnio lygio $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Trūksta argumento --pacman" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Trūksta argumento --pacman-conf" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Trūksta argumento --ala-url" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Trūksta argumento --pacman-cache" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Trūksta argumento --pacman-log" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Trūksta argumento --maxdepth" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Trūksta argumento --pacman" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Neatpažinta parinktis $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "Nepateikta jokių pakuočių, leidžiančių pažengti žemiau" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade turi būti paleistas kaip root" diff --git a/locale/downgrade/nb.po b/locale/downgrade/nb.po index f4f5f49..53e758b 100644 --- a/locale/downgrade/nb.po +++ b/locale/downgrade/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 12:48-0400\n" "Last-Translator: Håkon Vågsether , \n" @@ -88,7 +88,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "legg til $pkg i IgnorePkg? [j/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -125,62 +125,62 @@ msgstr "legg til $pkg i IgnorePkg? [j/N] " msgid "y" msgstr "j" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "ekstern" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "Ingen resultater" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Ugyldig valg" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "Kan ikke nedgradere $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Mangler --pacman-conf -argumentet" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Mangler --ala-url -argumentet" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Mangler --pacman-cache -argumentet" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Mangler --pacman-log -argumentet" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Mangler --maxdepth -argumentet" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Ukjent alternativ $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "Ingen pakker gitt for nedgradering" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade må kjøres som root" diff --git a/locale/downgrade/nn.po b/locale/downgrade/nn.po index 1cc5ce8..de78f83 100644 --- a/locale/downgrade/nn.po +++ b/locale/downgrade/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 12:48-0400\n" "Last-Translator: Håkon Vågsether , \n" @@ -88,7 +88,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "legg til $pkg i IgnorePkg? [j/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -125,62 +125,62 @@ msgstr "legg til $pkg i IgnorePkg? [j/N] " msgid "y" msgstr "j" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "ekstern" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "Ingen resultater" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Ugyldig valg" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "Kan ikke nedgradere $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Mangler --pacman-conf -argumentet" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Mangler --ala-url -argumentet" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Mangler --pacman-cache -argumentet" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Mangler --pacman-log -argumentet" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Mangler --maxdepth -argumentet" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Ukjent alternativ $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "Ingen pakker gitt for nedgradering" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade må kjøres som root" diff --git a/locale/downgrade/pl.po b/locale/downgrade/pl.po index 91d2f8a..1597245 100644 --- a/locale/downgrade/pl.po +++ b/locale/downgrade/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 17:23+0200\n" "Last-Translator: Tomasz \"Ludvick\" Niedzielski , " "\n" @@ -91,7 +91,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "dodać $pkg do IgnorePkg? [t/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -127,62 +127,62 @@ msgstr "dodać $pkg do IgnorePkg? [t/N] " msgid "y" msgstr "t" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "do pobrania" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "Nie znaleziono wyników" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Nieprawidłowy wybór" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "Nie można obniżyć poziomu $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Brak argumentu --pacman" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Brak argumentu --pacman-conf" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Brak argumentu --ala-url" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Brak argumentu --pacman-cache" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Brak argumentu --pacman-log" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Brak argumentu --maxdepth" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Brak argumentu --pacman" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Nierozpoznana opcja $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "Brak pakietów do obniżenia" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade musi być uruchamiany jako root" diff --git a/locale/downgrade/pt_BR.po b/locale/downgrade/pt_BR.po index 4ac43aa..a71a6ce 100644 --- a/locale/downgrade/pt_BR.po +++ b/locale/downgrade/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 01:23-0300\n" "Last-Translator: Thiago Perrotta , \n" @@ -89,7 +89,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "adicionar $pkg em IgnorePkg? [s/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -125,62 +125,62 @@ msgstr "adicionar $pkg em IgnorePkg? [s/N] " msgid "y" msgstr "s" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "remoto" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "Nenhum resultado encontrado" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Escolha inválida" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "Não foi possível fazer o downgrade $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Argumento --pacman ausente" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Argumento --pacman-conf ausente" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Argumento --ala-url ausente" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Argumento --pacman-cache ausente" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Argumento --pacman-log ausente" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Argumento --maxdepth ausente" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Argumento --pacman ausente" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Opção não reconhecida $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "Nenhum pacote fornecido para desatualização" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade deve ser executado como root" diff --git a/locale/downgrade/ru.po b/locale/downgrade/ru.po index aaf03fb..eef6160 100644 --- a/locale/downgrade/ru.po +++ b/locale/downgrade/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 14:25-0300\n" "Last-Translator: Nurlan , \n" "Language-Team: Russian\n" @@ -90,7 +90,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "добавить $pkg в список проигнорированных пакетов? [д/Н] " #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -127,62 +127,62 @@ msgstr "добавить $pkg в список проигнорированных msgid "y" msgstr "д" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "дистанционно" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "результаты не найдены" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "Неверный выбор" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "Невозможно понизить $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "Отсутствует аргумент --pacman" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "Отсутствует аргумент --pacman-conf" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "Отсутствует аргумент --ala-url" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "Отсутствует аргумент --pacman-cache" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "Отсутствует аргумент --pacman-log" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "Отсутствует аргумент --maxdepth" -#: bin/downgrade:430 +#: bin/downgrade:444 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Отсутствует аргумент --pacman" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "Нераспознанная опция $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "Нет пакетов для понижения" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade должен запускаться как root" diff --git a/locale/downgrade/zh_CN.po b/locale/downgrade/zh_CN.po index 235af04..6e68b48 100644 --- a/locale/downgrade/zh_CN.po +++ b/locale/downgrade/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 13:40+0200\n" +"POT-Creation-Date: 2023-10-04 15:15+0200\n" "PO-Revision-Date: 2020-04-21 23:16+0800\n" "Last-Translator: , \n" "Language-Team: Chinese\n" @@ -86,7 +86,7 @@ msgid "whether to add packages to IgnorePkg" msgstr "是否添加软件包到 IgnorePkg" #: bin/downgrade:30 -msgid "never prompt for version or location, just pick any candidate" +msgid "never prompt for version or location, pick automatically instead" msgstr "" #: bin/downgrade:31 @@ -122,61 +122,61 @@ msgstr "添加 $pkg 到 IgnorePkg? [y/N] " msgid "y" msgstr "y" -#: bin/downgrade:240 +#: bin/downgrade:242 msgid "remote" msgstr "远端" -#: bin/downgrade:289 +#: bin/downgrade:302 msgid "No results found" msgstr "未找到结果" -#: bin/downgrade:302 +#: bin/downgrade:316 msgid "Invalid choice" msgstr "选择无效" -#: bin/downgrade:315 +#: bin/downgrade:329 #, sh-format msgid "Unable to downgrade $name" msgstr "无法降级 $name" -#: bin/downgrade:344 +#: bin/downgrade:358 msgid "Missing --pacman argument" msgstr "缺少 --pacman 参数" -#: bin/downgrade:357 +#: bin/downgrade:371 msgid "Missing --pacman-conf argument" msgstr "缺少 --pacman-conf 参数" -#: bin/downgrade:370 +#: bin/downgrade:384 msgid "Missing --ala-url argument" msgstr "缺少 --ala-url 参数" -#: bin/downgrade:383 +#: bin/downgrade:397 msgid "Missing --pacman-cache argument" msgstr "缺少 --pacman-cache 参数" -#: bin/downgrade:396 +#: bin/downgrade:410 msgid "Missing --pacman-log argument" msgstr "缺少 --pacman-log 参数" -#: bin/downgrade:409 +#: bin/downgrade:423 msgid "Missing --maxdepth argument" msgstr "缺少 --maxdepth 参数" -#: bin/downgrade:430 +#: bin/downgrade:444 msgid "Missing or wrong --ignore argument" msgstr "--pacman 参数缺失或有误" -#: bin/downgrade:450 +#: bin/downgrade:464 #, sh-format msgid "Unrecognized option $current_option" msgstr "无法识别的选项 $current_option" -#: bin/downgrade:465 +#: bin/downgrade:479 msgid "No packages provided for downgrading" msgstr "没有提供降级包" -#: bin/downgrade:533 +#: bin/downgrade:547 msgid "downgrade must be run as root" msgstr "downgrade 必须以 root 身份运行" From 6bb81c93cb49a826b704eb7c38bd239489681982 Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Wed, 4 Oct 2023 15:23:22 +0200 Subject: [PATCH 05/11] any-candidate in fish completion --- completion/downgrade/fish | 1 + 1 file changed, 1 insertion(+) diff --git a/completion/downgrade/fish b/completion/downgrade/fish index 40bc7e5..1583357 100644 --- a/completion/downgrade/fish +++ b/completion/downgrade/fish @@ -9,5 +9,6 @@ complete -c $cmd -l ala-url -x -d 'location of ALA server' complete -c $cmd -l ala-only -d 'only use ALA server' complete -c $cmd -l cached-only -d 'only use cached packages' complete -c $cmd -l ignore -x -d 'whether to add packages to IgnorePkg' -a 'prompt always never' +complete -c $cmd -l any-candidate -d 'automatic package selection' complete -c $cmd -l version -d 'show downgrade version' complete -c $cmd -s h -l help -d 'show help script' From 95bc983268d6c542d1a3d4b5678258bc34b6520d Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Thu, 5 Oct 2023 21:54:15 +0200 Subject: [PATCH 06/11] remove --any-candidate in favor of --latest, --oldest, --cache-preferred --- bin/downgrade | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/bin/downgrade b/bin/downgrade index 6adc6d0..0ae689b 100755 --- a/bin/downgrade +++ b/bin/downgrade @@ -27,7 +27,9 @@ $(gettext "Options"): --cached-only $(gettext "only use cached packages") --ignore $(gettext "whether to add packages to IgnorePkg") - --any-candidate $(gettext "never prompt for version or location, pick automatically instead") + --latest $(gettext "pick latest matching version") + --oldest $(gettext "pick oldest matching version") + --cache-preferred $(gettext "do not query ala if a matching package was found in cache") --version $(gettext "show downgrade version") -h, --help $(gettext "show help script") @@ -289,10 +291,8 @@ process_term() { if ((DOWNGRADE_FROM_CACHE)); then candidates+=($(search_cache "$name" | filter_packages "$name" "$operator" "$version")) fi - if ((DOWNGRADE_FROM_ALA)); then - if ((DOWNGRADE_TO_ANY == 0)) || (("${#candidates[@]}" == 0)); then - candidates=($(search_ala "$name" | filter_packages "$name" "$operator" "$version") "${candidates[@]}") - fi + if ((DOWNGRADE_FROM_ALA)) && { ((! DOWNGRADE_PREFER_CACHE)) || ((${#candidates[@]} == 0)); }; then + candidates=($(search_ala "$name" | filter_packages "$name" "$operator" "$version") "${candidates[@]}") fi candidates=($(printf '%s\n' "${candidates[@]}" | sort_packages)) @@ -304,9 +304,12 @@ process_term() { } >&2 elif (("${#candidates[@]}" == 1)); then choice=${candidates[0]} - elif ((DOWNGRADE_TO_ANY)); then + elif ((DOWNGRADE_TO_LATEST)); then # Select the most up to date package choice=${candidates[-1]} + elif ((DOWNGRADE_TO_OLDEST)); then + # Select the most out of date + choice=${candidates[0]} else choice=$(present_packages "$name" "${candidates[@]}" | fzf --tac --border --header-lines 1 --tiebreak=begin | @@ -448,8 +451,16 @@ parse_options() { exit 1 fi ;; - --any-candidate) - DOWNGRADE_TO_ANY=1 + --latest) + DOWNGRADE_TO_LATEST=1 + DOWNGRADE_TO_OLDEST=0 + ;; + --oldest) + DOWNGRADE_TO_LATEST=0 + DOWNGRADE_TO_OLDEST=1 + ;; + --cache-preferred) + DOWNGRADE_PREFER_CACHE=1 ;; --) shift @@ -512,7 +523,9 @@ DOWNGRADE_MAXDEPTH=1 DOWNGRADE_CONF="/etc/xdg/downgrade/downgrade.conf" DOWNGRADE_VERSION="11.3.0" DOWNGRADE_IGNORE="prompt" -DOWNGRADE_TO_ANY=0 +DOWNGRADE_TO_LATEST=0 +DOWNGRADE_TO_OLDEST=0 +DOWNGRADE_PREFER_CACHE=0 # Main code execution if ((!LIB)); then From f7bf587ab5f20e0beb792349abc9237104846bf6 Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Thu, 5 Oct 2023 22:07:24 +0200 Subject: [PATCH 07/11] update documentation, completion, readme and locales for --oldest --latest --cache-preferred --- README.md | 6 +++-- completion/downgrade/fish | 4 ++- completion/downgrade/zsh | 4 ++- doc/downgrade.8.md | 15 ++++++----- locale/downgrade.pot | 54 ++++++++++++++++++++++----------------- locale/downgrade/cs.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/es.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/fr.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/lt.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/nb.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/nn.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/pl.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/pt_BR.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/ru.po | 54 ++++++++++++++++++++++----------------- locale/downgrade/zh_CN.po | 54 ++++++++++++++++++++++----------------- 15 files changed, 360 insertions(+), 263 deletions(-) diff --git a/README.md b/README.md index 84f0bfa..b2671a8 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,9 @@ Options: --cached-only only use cached packages --ignore whether to add packages to IgnorePkg - --any-candidate never prompt for version or location, pick automatically instead + --latest pick latest matching version + --oldest pick oldest matching version + --cache-preferred do not query ala if a matching package was found in cache --version show downgrade version -h, --help show help script @@ -82,7 +84,7 @@ Downgrade a package, looking in only the A.L.A.: Noninteractively downgrade foo to 1.0.0-1 ``` -# downgrade --any-candidate --ignore never 'foo=1.0.0-1' +# downgrade --latest --prefer-cache --ignore never 'foo=1.0.0-1' ``` ## Configuration diff --git a/completion/downgrade/fish b/completion/downgrade/fish index 1583357..b71681c 100644 --- a/completion/downgrade/fish +++ b/completion/downgrade/fish @@ -9,6 +9,8 @@ complete -c $cmd -l ala-url -x -d 'location of ALA server' complete -c $cmd -l ala-only -d 'only use ALA server' complete -c $cmd -l cached-only -d 'only use cached packages' complete -c $cmd -l ignore -x -d 'whether to add packages to IgnorePkg' -a 'prompt always never' -complete -c $cmd -l any-candidate -d 'automatic package selection' +complete -c $cmd -l latest -d 'pick latest matching version' +complete -c $cmd -l oldest -d 'pick oldest matching version' +complete -c $cmd -l cache-preferred -d 'skip ala if matched in cache' complete -c $cmd -l version -d 'show downgrade version' complete -c $cmd -s h -l help -d 'show help script' diff --git a/completion/downgrade/zsh b/completion/downgrade/zsh index d545d92..d964e95 100644 --- a/completion/downgrade/zsh +++ b/completion/downgrade/zsh @@ -25,7 +25,9 @@ _downgrade () { '--ala-only[only use ALA server]' \ '--cached-only[only use cached packages]' \ '--ignore[whether to add packages to IgnorePkg]:action:(prompt always never)' \ - '--any-candidate[automatic package selection]' \ + '--latest[pick latest matching version]' \ + '--oldest[pick oldest matching version]' \ + '--cache-preferred[skip ala if matched in cache]' \ '--version[show downgrade version]' \ {-h,--help}'[show help script]' \ '*:packages:->pkg' diff --git a/doc/downgrade.8.md b/doc/downgrade.8.md index e942087..ac2f87d 100644 --- a/doc/downgrade.8.md +++ b/doc/downgrade.8.md @@ -91,13 +91,16 @@ on the ALA. > Whether to add packages to IgnorePkg, default is _prompt_. -**\--any-candidate**\ +**\--latest | \--oldest**\ -> Never prompt for version or location, pick automatically instead. Allows for -> noninteractive downgrades when used in conjunction with --ignore -> If a package matching the version filter is found in the cache, pick the -> latest matching version from cache. Íf no matches are found in cache or -> --ala-only was specified, then pick the latest matching version from ala. +> Never prompt for version or location, automatically pick the most up to +> date/most out of date version. Allows for noninteractive downgrades when +> used in conjunction with `--ignore`. + +**\--cache-preferred**\ + +> If a package matching the version filter is found in the cache, skip querying +> ala. **\--version**\ diff --git a/locale/downgrade.pot b/locale/downgrade.pot index 507036c..5b01631 100644 --- a/locale/downgrade.pot +++ b/locale/downgrade.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,96 +85,104 @@ msgid "whether to add packages to IgnorePkg" msgstr "" #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 -msgid "show downgrade version" +msgid "pick oldest matching version" msgstr "" #: bin/downgrade:32 -msgid "show help script" +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 +msgid "show downgrade version" msgstr "" #: bin/downgrade:34 +msgid "show help script" +msgstr "" + +#: bin/downgrade:36 msgid "Note" msgstr "" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "" -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "" -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "" -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "" -#: bin/downgrade:444 +#: bin/downgrade:449 msgid "Missing or wrong --ignore argument" msgstr "" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "" diff --git a/locale/downgrade/cs.po b/locale/downgrade/cs.po index 5adbfcd..f8b6aae 100644 --- a/locale/downgrade/cs.po +++ b/locale/downgrade/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 21:10+0100\n" "Last-Translator: , \n" "Language-Team: Czech\n" @@ -89,98 +89,106 @@ msgid "whether to add packages to IgnorePkg" msgstr "přidat $pkg mezi ignorované? [a/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "zobrazit downgrade verzi" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "zobrazit skript nápovědy" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Poznámka" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "Možnosti za znaky -- budou považovány za možnosti pacmanu." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "Pro více informací vizte downgrade(8)" -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Dostupné balíčky" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "přidat $pkg mezi ignorované? [a/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "a" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "vzdálený" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "Nebyly nalezeny žádné výsledky" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Neplatná volba" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "Nelze downgradovat $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Chybí argument --pacman" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Chybí argument --pacman-conf" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Chybí argument --ala-url" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Chybí argument --pacman-cache" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Chybí argument --pacman-log" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Chybí argument --maxdepth" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Chybí argument --pacman" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Nerozpoznaná možnost $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "Pro downgradování nebyly poskytnuty žádné balíčky" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade musí být spuštěn jako root" diff --git a/locale/downgrade/es.po b/locale/downgrade/es.po index 2ba8e8e..30516a6 100644 --- a/locale/downgrade/es.po +++ b/locale/downgrade/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 18:01-0400\n" "Last-Translator: , \n" "Language-Team: Spanish\n" @@ -87,100 +87,108 @@ msgid "whether to add packages to IgnorePkg" msgstr "Añadir $pkg a paquetes ignorados [s/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "mostrar la versión downgrade" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "mostrar guión de ayuda" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Nota" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Las opciones después de los caracteres -- se tratarán como opciones de " "pacman." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "Ver downgrade(8) para más detalles." -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Paquetes disponibles" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "Añadir $pkg a paquetes ignorados [s/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "s" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "remoto" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "No se han encontrado resultados" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Elección inválida" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "No se puede degradar $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Falta el argumento --pacman" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Falta el argumento --pacman-conf" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Falta el argumento --ala-url" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Falta el argumento --pacman-cache" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Falta el argumento --pacman-log" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Falta el argumento --maxdepth" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Falta el argumento --pacman" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Opción no reconocida $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "No se proporcionan paquetes para degradar" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade debe ejecutarse como root" diff --git a/locale/downgrade/fr.po b/locale/downgrade/fr.po index ef647cd..23433f7 100644 --- a/locale/downgrade/fr.po +++ b/locale/downgrade/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 12:56-0400\n" "Last-Translator: , \n" "Language-Team: French\n" @@ -91,101 +91,109 @@ msgstr "" "automatiquement ? [o/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "afficher la version downgrade" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "afficher le script d'aide" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Remarque" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Les options après les caractères -- seront traitées comme des options pacman." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "Voir downgrade(8) pour plus de détails." -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Paquets disponibles" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "" "Ajouter $pkg dans la liste des paquets à ne pas mettre à jour " "automatiquement ? [o/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "o" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "distant" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "Aucun résultat trouvé" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Choix invalide" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "Impossible de rétrograder $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Argument --pacman manquant" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Argument --pacman-conf manquant" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Argument --ala-url manquant" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Argument --pacman-cache manquant" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Argument --pacman-log manquant" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Argument --maxdepth manquant" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Argument --pacman manquant" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Option non reconnue $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "Aucun package fourni pour la rétrogradation" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "le downgrade doit être exécuté en tant que root" diff --git a/locale/downgrade/lt.po b/locale/downgrade/lt.po index 73998f0..1557775 100644 --- a/locale/downgrade/lt.po +++ b/locale/downgrade/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 13:53+0200\n" "Last-Translator: Algimantas Margevičius , " "\n" @@ -92,98 +92,106 @@ msgid "whether to add packages to IgnorePkg" msgstr "pridėti $pkg į IgnorePkg? [t/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "rodyti downgrade versiją" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "rodyti pagalbos scenarijų" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Pastaba" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "Parinktys po simbolių -- bus traktuojamos kaip pacman parinktys." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "Išsamiau galite paskaityti downgrade(8)." -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Prieinami paketai" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "pridėti $pkg į IgnorePkg? [t/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "t" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "nutolęs" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "Nieko nerasta" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Netinkamas pasirinkimas" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "Neįmanoma paversti žemesnio lygio $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Trūksta argumento --pacman" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Trūksta argumento --pacman-conf" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Trūksta argumento --ala-url" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Trūksta argumento --pacman-cache" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Trūksta argumento --pacman-log" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Trūksta argumento --maxdepth" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Trūksta argumento --pacman" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Neatpažinta parinktis $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "Nepateikta jokių pakuočių, leidžiančių pažengti žemiau" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade turi būti paleistas kaip root" diff --git a/locale/downgrade/nb.po b/locale/downgrade/nb.po index 53e758b..cff1cd2 100644 --- a/locale/downgrade/nb.po +++ b/locale/downgrade/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 12:48-0400\n" "Last-Translator: Håkon Vågsether , \n" @@ -88,99 +88,107 @@ msgid "whether to add packages to IgnorePkg" msgstr "legg til $pkg i IgnorePkg? [j/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "vis downgrade versjonen" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "vis hjelpeskript" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Merk" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Alternativer etter -- tegnene vil bli behandlet som pacman-alternativer." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "Se downgrade(8) for detaljer." -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Tilgjengelige pakker" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "legg til $pkg i IgnorePkg? [j/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "j" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "ekstern" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "Ingen resultater" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Ugyldig valg" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "Kan ikke nedgradere $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Mangler --pacman-conf -argumentet" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Mangler --ala-url -argumentet" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Mangler --pacman-cache -argumentet" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Mangler --pacman-log -argumentet" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Mangler --maxdepth -argumentet" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Ukjent alternativ $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "Ingen pakker gitt for nedgradering" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade må kjøres som root" diff --git a/locale/downgrade/nn.po b/locale/downgrade/nn.po index de78f83..95dc1fa 100644 --- a/locale/downgrade/nn.po +++ b/locale/downgrade/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 12:48-0400\n" "Last-Translator: Håkon Vågsether , \n" @@ -88,99 +88,107 @@ msgid "whether to add packages to IgnorePkg" msgstr "legg til $pkg i IgnorePkg? [j/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "vis downgrade versjonen" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "vis hjelpeskript" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Merk" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Alternativer etter -- tegnene vil bli behandlet som pacman-alternativer." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "Sjå downgrade(8) for detaljar." -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Tilgjengelege pakkar" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "legg til $pkg i IgnorePkg? [j/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "j" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "ekstern" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "Ingen resultater" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Ugyldig valg" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "Kan ikke nedgradere $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Mangler --pacman-conf -argumentet" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Mangler --ala-url -argumentet" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Mangler --pacman-cache -argumentet" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Mangler --pacman-log -argumentet" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Mangler --maxdepth -argumentet" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Ukjent alternativ $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "Ingen pakker gitt for nedgradering" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade må kjøres som root" diff --git a/locale/downgrade/pl.po b/locale/downgrade/pl.po index 1597245..8974318 100644 --- a/locale/downgrade/pl.po +++ b/locale/downgrade/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 17:23+0200\n" "Last-Translator: Tomasz \"Ludvick\" Niedzielski , " "\n" @@ -91,98 +91,106 @@ msgid "whether to add packages to IgnorePkg" msgstr "dodać $pkg do IgnorePkg? [t/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "pokaż downgrade wersję" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "pokaż skrypt pomocy" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Uwaga" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "Opcje po znakach -- będą traktowane jako opcje Pacman." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "Zobacz downgrade(8) po szczegóły." -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Dostępne pakiety" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "dodać $pkg do IgnorePkg? [t/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "t" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "do pobrania" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "Nie znaleziono wyników" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Nieprawidłowy wybór" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "Nie można obniżyć poziomu $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Brak argumentu --pacman" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Brak argumentu --pacman-conf" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Brak argumentu --ala-url" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Brak argumentu --pacman-cache" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Brak argumentu --pacman-log" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Brak argumentu --maxdepth" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Brak argumentu --pacman" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Nierozpoznana opcja $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "Brak pakietów do obniżenia" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade musi być uruchamiany jako root" diff --git a/locale/downgrade/pt_BR.po b/locale/downgrade/pt_BR.po index a71a6ce..38a1276 100644 --- a/locale/downgrade/pt_BR.po +++ b/locale/downgrade/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 01:23-0300\n" "Last-Translator: Thiago Perrotta , \n" @@ -89,98 +89,106 @@ msgid "whether to add packages to IgnorePkg" msgstr "adicionar $pkg em IgnorePkg? [s/N] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "mostrar a versão downgrade" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "mostrar script de ajuda" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Nota" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "As opções após os caracteres -- serão tratadas como opções do pacman." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "Veja downgrade(8) para mais detalhes." -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Pacotes disponíveis" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "adicionar $pkg em IgnorePkg? [s/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "s" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "remoto" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "Nenhum resultado encontrado" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Escolha inválida" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "Não foi possível fazer o downgrade $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Argumento --pacman ausente" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Argumento --pacman-conf ausente" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Argumento --ala-url ausente" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Argumento --pacman-cache ausente" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Argumento --pacman-log ausente" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Argumento --maxdepth ausente" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Argumento --pacman ausente" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Opção não reconhecida $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "Nenhum pacote fornecido para desatualização" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade deve ser executado como root" diff --git a/locale/downgrade/ru.po b/locale/downgrade/ru.po index eef6160..e87e7fa 100644 --- a/locale/downgrade/ru.po +++ b/locale/downgrade/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 14:25-0300\n" "Last-Translator: Nurlan , \n" "Language-Team: Russian\n" @@ -90,99 +90,107 @@ msgid "whether to add packages to IgnorePkg" msgstr "добавить $pkg в список проигнорированных пакетов? [д/Н] " #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "показать версию downgrade" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "показать скрипт помощи" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "Заметка" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "" "Параметры после символов -- будут рассматриваться как параметры pacman." -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "см. downgrade(8) для подробностей." -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "Доступные пакеты" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "добавить $pkg в список проигнорированных пакетов? [д/Н] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "д" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "дистанционно" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "результаты не найдены" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "Неверный выбор" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "Невозможно понизить $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "Отсутствует аргумент --pacman" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "Отсутствует аргумент --pacman-conf" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "Отсутствует аргумент --ala-url" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "Отсутствует аргумент --pacman-cache" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "Отсутствует аргумент --pacman-log" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "Отсутствует аргумент --maxdepth" -#: bin/downgrade:444 +#: bin/downgrade:449 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Отсутствует аргумент --pacman" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "Нераспознанная опция $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "Нет пакетов для понижения" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade должен запускаться как root" diff --git a/locale/downgrade/zh_CN.po b/locale/downgrade/zh_CN.po index 6e68b48..0edae68 100644 --- a/locale/downgrade/zh_CN.po +++ b/locale/downgrade/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-04 15:15+0200\n" +"POT-Creation-Date: 2023-10-05 22:03+0200\n" "PO-Revision-Date: 2020-04-21 23:16+0800\n" "Last-Translator: , \n" "Language-Team: Chinese\n" @@ -86,97 +86,105 @@ msgid "whether to add packages to IgnorePkg" msgstr "是否添加软件包到 IgnorePkg" #: bin/downgrade:30 -msgid "never prompt for version or location, pick automatically instead" +msgid "pick latest matching version" msgstr "" #: bin/downgrade:31 +msgid "pick oldest matching version" +msgstr "" + +#: bin/downgrade:32 +msgid "do not query ala if a matching package was found in cache" +msgstr "" + +#: bin/downgrade:33 msgid "show downgrade version" msgstr "显示 downgrade 版本" -#: bin/downgrade:32 +#: bin/downgrade:34 msgid "show help script" msgstr "显示帮助脚本" -#: bin/downgrade:34 +#: bin/downgrade:36 msgid "Note" msgstr "注意" -#: bin/downgrade:35 +#: bin/downgrade:37 msgid "Options after the -- characters will be treated as pacman options." msgstr "-- 字符后的选项将被视为 pacman 选项。" -#: bin/downgrade:36 +#: bin/downgrade:38 msgid "See downgrade(8) for details." msgstr "详情请查看 downgrade(8)。" -#: bin/downgrade:98 +#: bin/downgrade:100 msgid "Available packages" msgstr "可选的包" -#: bin/downgrade:128 +#: bin/downgrade:130 #, sh-format msgid "add $pkg to IgnorePkg? [y/N] " msgstr "添加 $pkg 到 IgnorePkg? [y/N] " -#: bin/downgrade:130 +#: bin/downgrade:132 msgid "y" msgstr "y" -#: bin/downgrade:242 +#: bin/downgrade:244 msgid "remote" msgstr "远端" -#: bin/downgrade:302 +#: bin/downgrade:304 msgid "No results found" msgstr "未找到结果" -#: bin/downgrade:316 +#: bin/downgrade:321 msgid "Invalid choice" msgstr "选择无效" -#: bin/downgrade:329 +#: bin/downgrade:334 #, sh-format msgid "Unable to downgrade $name" msgstr "无法降级 $name" -#: bin/downgrade:358 +#: bin/downgrade:363 msgid "Missing --pacman argument" msgstr "缺少 --pacman 参数" -#: bin/downgrade:371 +#: bin/downgrade:376 msgid "Missing --pacman-conf argument" msgstr "缺少 --pacman-conf 参数" -#: bin/downgrade:384 +#: bin/downgrade:389 msgid "Missing --ala-url argument" msgstr "缺少 --ala-url 参数" -#: bin/downgrade:397 +#: bin/downgrade:402 msgid "Missing --pacman-cache argument" msgstr "缺少 --pacman-cache 参数" -#: bin/downgrade:410 +#: bin/downgrade:415 msgid "Missing --pacman-log argument" msgstr "缺少 --pacman-log 参数" -#: bin/downgrade:423 +#: bin/downgrade:428 msgid "Missing --maxdepth argument" msgstr "缺少 --maxdepth 参数" -#: bin/downgrade:444 +#: bin/downgrade:449 msgid "Missing or wrong --ignore argument" msgstr "--pacman 参数缺失或有误" -#: bin/downgrade:464 +#: bin/downgrade:475 #, sh-format msgid "Unrecognized option $current_option" msgstr "无法识别的选项 $current_option" -#: bin/downgrade:479 +#: bin/downgrade:490 msgid "No packages provided for downgrading" msgstr "没有提供降级包" -#: bin/downgrade:547 +#: bin/downgrade:560 msgid "downgrade must be run as root" msgstr "downgrade 必须以 root 身份运行" From 99016d16e891715128015d14d1b93d489707b2c2 Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Fri, 15 Dec 2023 14:19:52 +0100 Subject: [PATCH 08/11] rename cache-preferred to prefer-cache --- README.md | 2 +- bin/downgrade | 4 ++-- completion/downgrade/fish | 2 +- completion/downgrade/zsh | 2 +- doc/downgrade.8 | 24 +++++++++++++++++++++++- doc/downgrade.8.md | 2 +- 6 files changed, 29 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b2671a8..ceda570 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Options: whether to add packages to IgnorePkg --latest pick latest matching version --oldest pick oldest matching version - --cache-preferred do not query ala if a matching package was found in cache + --prefer-cache do not query ala if a matching package was found in cache --version show downgrade version -h, --help show help script diff --git a/bin/downgrade b/bin/downgrade index 0ae689b..45d3a57 100755 --- a/bin/downgrade +++ b/bin/downgrade @@ -29,7 +29,7 @@ $(gettext "Options"): $(gettext "whether to add packages to IgnorePkg") --latest $(gettext "pick latest matching version") --oldest $(gettext "pick oldest matching version") - --cache-preferred $(gettext "do not query ala if a matching package was found in cache") + --prefer-cache $(gettext "do not query ala if a matching package was found in cache") --version $(gettext "show downgrade version") -h, --help $(gettext "show help script") @@ -459,7 +459,7 @@ parse_options() { DOWNGRADE_TO_LATEST=0 DOWNGRADE_TO_OLDEST=1 ;; - --cache-preferred) + --prefer-cache) DOWNGRADE_PREFER_CACHE=1 ;; --) diff --git a/completion/downgrade/fish b/completion/downgrade/fish index b71681c..892c4df 100644 --- a/completion/downgrade/fish +++ b/completion/downgrade/fish @@ -11,6 +11,6 @@ complete -c $cmd -l cached-only -d 'only use cached packages' complete -c $cmd -l ignore -x -d 'whether to add packages to IgnorePkg' -a 'prompt always never' complete -c $cmd -l latest -d 'pick latest matching version' complete -c $cmd -l oldest -d 'pick oldest matching version' -complete -c $cmd -l cache-preferred -d 'skip ala if matched in cache' +complete -c $cmd -l prefer-cache -d 'skip ala if matched in cache' complete -c $cmd -l version -d 'show downgrade version' complete -c $cmd -s h -l help -d 'show help script' diff --git a/completion/downgrade/zsh b/completion/downgrade/zsh index d964e95..b8f4815 100644 --- a/completion/downgrade/zsh +++ b/completion/downgrade/zsh @@ -27,7 +27,7 @@ _downgrade () { '--ignore[whether to add packages to IgnorePkg]:action:(prompt always never)' \ '--latest[pick latest matching version]' \ '--oldest[pick oldest matching version]' \ - '--cache-preferred[skip ala if matched in cache]' \ + '--prefer-cache[skip ala if matched in cache]' \ '--version[show downgrade version]' \ {-h,--help}'[show help script]' \ '*:packages:->pkg' diff --git a/doc/downgrade.8 b/doc/downgrade.8 index 4cf480a..9ebbf87 100644 --- a/doc/downgrade.8 +++ b/doc/downgrade.8 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pandoc 3.0.1 +.\" Automatically generated by Pandoc 3.1.6 .\" .\" Define V font for inline verbatim, using C font in formats .\" that render this, and otherwise B font. @@ -158,6 +158,28 @@ Search local cache only. Whether to add packages to IgnorePkg, default is \f[I]prompt\f[R]. .RE .PP +\f[B]--latest | \[en]oldest\f[R] +.PD 0 +.P +.PD +.RS +.PP +Never prompt for version or location, automatically pick the most up to +date/most out of date version. +Allows for noninteractive downgrades when used in conjunction with +\[en]ignore +.RE +.PP +\f[B]--prefer-cache\f[R] +.PD 0 +.P +.PD +.RS +.PP +If a package matching the version filter is found in the cache, skip +querying ala. +.RE +.PP \f[B]--version\f[R] .PD 0 .P diff --git a/doc/downgrade.8.md b/doc/downgrade.8.md index ac2f87d..8985d4c 100644 --- a/doc/downgrade.8.md +++ b/doc/downgrade.8.md @@ -97,7 +97,7 @@ on the ALA. > date/most out of date version. Allows for noninteractive downgrades when > used in conjunction with `--ignore`. -**\--cache-preferred**\ +**\--prefer-cache**\ > If a package matching the version filter is found in the cache, skip querying > ala. From cca62b615eb90a75e04e1dbfb00a906ee11a5fb6 Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Fri, 15 Dec 2023 14:26:44 +0100 Subject: [PATCH 09/11] explain relationship between --prefer-cache and --cached-only --- doc/downgrade.8 | 2 ++ doc/downgrade.8.md | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/downgrade.8 b/doc/downgrade.8 index 9ebbf87..864d42e 100644 --- a/doc/downgrade.8 +++ b/doc/downgrade.8 @@ -178,6 +178,8 @@ Allows for noninteractive downgrades when used in conjunction with .PP If a package matching the version filter is found in the cache, skip querying ala. +Unlike \[en]cached-only, \[en]prefer-cache does query ala if no package +could be matched in cache. .RE .PP \f[B]--version\f[R] diff --git a/doc/downgrade.8.md b/doc/downgrade.8.md index 8985d4c..3dbd9a1 100644 --- a/doc/downgrade.8.md +++ b/doc/downgrade.8.md @@ -100,7 +100,8 @@ on the ALA. **\--prefer-cache**\ > If a package matching the version filter is found in the cache, skip querying -> ala. +> ala. Unlike --cached-only, --prefer-cache does query ala if no package could +> be matched in cache. **\--version**\ From d75b63242be75441c9891e659f52cff9b14e71ba Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Tue, 22 Oct 2024 00:04:08 +0200 Subject: [PATCH 10/11] update translations --- locale/downgrade.pot | 22 +++++++++++----------- locale/downgrade/cs.po | 22 +++++++++++----------- locale/downgrade/es.po | 22 +++++++++++----------- locale/downgrade/fr.po | 22 +++++++++++----------- locale/downgrade/lt.po | 22 +++++++++++----------- locale/downgrade/nb.po | 22 +++++++++++----------- locale/downgrade/nn.po | 22 +++++++++++----------- locale/downgrade/pl.po | 22 +++++++++++----------- locale/downgrade/pt_BR.po | 22 +++++++++++----------- locale/downgrade/ru.po | 22 +++++++++++----------- locale/downgrade/zh_CN.po | 22 +++++++++++----------- 11 files changed, 121 insertions(+), 121 deletions(-) diff --git a/locale/downgrade.pot b/locale/downgrade.pot index 5b01631..8b6c27a 100644 --- a/locale/downgrade.pot +++ b/locale/downgrade.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -133,44 +133,44 @@ msgstr "" msgid "remote" msgstr "" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "" -#: bin/downgrade:449 +#: bin/downgrade:447 msgid "Missing or wrong --ignore argument" msgstr "" diff --git a/locale/downgrade/cs.po b/locale/downgrade/cs.po index f8b6aae..2d64da2 100644 --- a/locale/downgrade/cs.po +++ b/locale/downgrade/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 21:10+0100\n" "Last-Translator: , \n" "Language-Team: Czech\n" @@ -137,44 +137,44 @@ msgstr "a" msgid "remote" msgstr "vzdálený" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "Nebyly nalezeny žádné výsledky" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Neplatná volba" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "Nelze downgradovat $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Chybí argument --pacman" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Chybí argument --pacman-conf" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Chybí argument --ala-url" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Chybí argument --pacman-cache" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Chybí argument --pacman-log" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Chybí argument --maxdepth" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Chybí argument --pacman" diff --git a/locale/downgrade/es.po b/locale/downgrade/es.po index 30516a6..91465fe 100644 --- a/locale/downgrade/es.po +++ b/locale/downgrade/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 18:01-0400\n" "Last-Translator: , \n" "Language-Team: Spanish\n" @@ -137,44 +137,44 @@ msgstr "s" msgid "remote" msgstr "remoto" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "No se han encontrado resultados" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Elección inválida" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "No se puede degradar $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Falta el argumento --pacman" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Falta el argumento --pacman-conf" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Falta el argumento --ala-url" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Falta el argumento --pacman-cache" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Falta el argumento --pacman-log" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Falta el argumento --maxdepth" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Falta el argumento --pacman" diff --git a/locale/downgrade/fr.po b/locale/downgrade/fr.po index 23433f7..da1d3ea 100644 --- a/locale/downgrade/fr.po +++ b/locale/downgrade/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 12:56-0400\n" "Last-Translator: , \n" "Language-Team: French\n" @@ -142,44 +142,44 @@ msgstr "o" msgid "remote" msgstr "distant" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "Aucun résultat trouvé" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Choix invalide" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "Impossible de rétrograder $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Argument --pacman manquant" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Argument --pacman-conf manquant" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Argument --ala-url manquant" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Argument --pacman-cache manquant" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Argument --pacman-log manquant" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Argument --maxdepth manquant" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Argument --pacman manquant" diff --git a/locale/downgrade/lt.po b/locale/downgrade/lt.po index 1557775..0da7402 100644 --- a/locale/downgrade/lt.po +++ b/locale/downgrade/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 13:53+0200\n" "Last-Translator: Algimantas Margevičius , " "\n" @@ -140,44 +140,44 @@ msgstr "t" msgid "remote" msgstr "nutolęs" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "Nieko nerasta" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Netinkamas pasirinkimas" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "Neįmanoma paversti žemesnio lygio $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Trūksta argumento --pacman" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Trūksta argumento --pacman-conf" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Trūksta argumento --ala-url" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Trūksta argumento --pacman-cache" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Trūksta argumento --pacman-log" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Trūksta argumento --maxdepth" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Trūksta argumento --pacman" diff --git a/locale/downgrade/nb.po b/locale/downgrade/nb.po index cff1cd2..2601350 100644 --- a/locale/downgrade/nb.po +++ b/locale/downgrade/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 12:48-0400\n" "Last-Translator: Håkon Vågsether , \n" @@ -137,44 +137,44 @@ msgstr "j" msgid "remote" msgstr "ekstern" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "Ingen resultater" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Ugyldig valg" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "Kan ikke nedgradere $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Mangler --pacman-conf -argumentet" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Mangler --ala-url -argumentet" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Mangler --pacman-cache -argumentet" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Mangler --pacman-log -argumentet" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Mangler --maxdepth -argumentet" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Mangler --pacman -argumentet" diff --git a/locale/downgrade/nn.po b/locale/downgrade/nn.po index 95dc1fa..74fa07d 100644 --- a/locale/downgrade/nn.po +++ b/locale/downgrade/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 12:48-0400\n" "Last-Translator: Håkon Vågsether , \n" @@ -137,44 +137,44 @@ msgstr "j" msgid "remote" msgstr "ekstern" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "Ingen resultater" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Ugyldig valg" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "Kan ikke nedgradere $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Mangler --pacman -argumentet" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Mangler --pacman-conf -argumentet" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Mangler --ala-url -argumentet" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Mangler --pacman-cache -argumentet" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Mangler --pacman-log -argumentet" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Mangler --maxdepth -argumentet" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Mangler --pacman -argumentet" diff --git a/locale/downgrade/pl.po b/locale/downgrade/pl.po index 8974318..40d8534 100644 --- a/locale/downgrade/pl.po +++ b/locale/downgrade/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 17:23+0200\n" "Last-Translator: Tomasz \"Ludvick\" Niedzielski , " "\n" @@ -139,44 +139,44 @@ msgstr "t" msgid "remote" msgstr "do pobrania" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "Nie znaleziono wyników" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Nieprawidłowy wybór" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "Nie można obniżyć poziomu $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Brak argumentu --pacman" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Brak argumentu --pacman-conf" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Brak argumentu --ala-url" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Brak argumentu --pacman-cache" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Brak argumentu --pacman-log" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Brak argumentu --maxdepth" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Brak argumentu --pacman" diff --git a/locale/downgrade/pt_BR.po b/locale/downgrade/pt_BR.po index 38a1276..5e9924b 100644 --- a/locale/downgrade/pt_BR.po +++ b/locale/downgrade/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 01:23-0300\n" "Last-Translator: Thiago Perrotta , \n" @@ -137,44 +137,44 @@ msgstr "s" msgid "remote" msgstr "remoto" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "Nenhum resultado encontrado" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Escolha inválida" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "Não foi possível fazer o downgrade $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Argumento --pacman ausente" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Argumento --pacman-conf ausente" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Argumento --ala-url ausente" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Argumento --pacman-cache ausente" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Argumento --pacman-log ausente" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Argumento --maxdepth ausente" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Argumento --pacman ausente" diff --git a/locale/downgrade/ru.po b/locale/downgrade/ru.po index e87e7fa..e4d720a 100644 --- a/locale/downgrade/ru.po +++ b/locale/downgrade/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 14:25-0300\n" "Last-Translator: Nurlan , \n" "Language-Team: Russian\n" @@ -139,44 +139,44 @@ msgstr "д" msgid "remote" msgstr "дистанционно" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "результаты не найдены" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "Неверный выбор" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "Невозможно понизить $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "Отсутствует аргумент --pacman" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "Отсутствует аргумент --pacman-conf" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "Отсутствует аргумент --ala-url" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "Отсутствует аргумент --pacman-cache" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "Отсутствует аргумент --pacman-log" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "Отсутствует аргумент --maxdepth" -#: bin/downgrade:449 +#: bin/downgrade:447 #, fuzzy msgid "Missing or wrong --ignore argument" msgstr "Отсутствует аргумент --pacman" diff --git a/locale/downgrade/zh_CN.po b/locale/downgrade/zh_CN.po index 0edae68..17a4870 100644 --- a/locale/downgrade/zh_CN.po +++ b/locale/downgrade/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: downgrade\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 22:03+0200\n" +"POT-Creation-Date: 2024-10-21 22:52+0200\n" "PO-Revision-Date: 2020-04-21 23:16+0800\n" "Last-Translator: , \n" "Language-Team: Chinese\n" @@ -134,44 +134,44 @@ msgstr "y" msgid "remote" msgstr "远端" -#: bin/downgrade:304 +#: bin/downgrade:302 msgid "No results found" msgstr "未找到结果" -#: bin/downgrade:321 +#: bin/downgrade:319 msgid "Invalid choice" msgstr "选择无效" -#: bin/downgrade:334 +#: bin/downgrade:332 #, sh-format msgid "Unable to downgrade $name" msgstr "无法降级 $name" -#: bin/downgrade:363 +#: bin/downgrade:361 msgid "Missing --pacman argument" msgstr "缺少 --pacman 参数" -#: bin/downgrade:376 +#: bin/downgrade:374 msgid "Missing --pacman-conf argument" msgstr "缺少 --pacman-conf 参数" -#: bin/downgrade:389 +#: bin/downgrade:387 msgid "Missing --ala-url argument" msgstr "缺少 --ala-url 参数" -#: bin/downgrade:402 +#: bin/downgrade:400 msgid "Missing --pacman-cache argument" msgstr "缺少 --pacman-cache 参数" -#: bin/downgrade:415 +#: bin/downgrade:413 msgid "Missing --pacman-log argument" msgstr "缺少 --pacman-log 参数" -#: bin/downgrade:428 +#: bin/downgrade:426 msgid "Missing --maxdepth argument" msgstr "缺少 --maxdepth 参数" -#: bin/downgrade:449 +#: bin/downgrade:447 msgid "Missing or wrong --ignore argument" msgstr "--pacman 参数缺失或有误" From 038591d14bed6cb7837d7cb7c8a0d57b95f3f4f3 Mon Sep 17 00:00:00 2001 From: krumelmonster Date: Tue, 22 Oct 2024 14:17:43 +0200 Subject: [PATCH 11/11] fix man page formatting and re-Make doc/downgrade.8 --- doc/downgrade.8 | 116 ++++++++++++++++++--------------------------- doc/downgrade.8.md | 2 +- 2 files changed, 47 insertions(+), 71 deletions(-) diff --git a/doc/downgrade.8 b/doc/downgrade.8 index 864d42e..d553ab1 100644 --- a/doc/downgrade.8 +++ b/doc/downgrade.8 @@ -1,69 +1,49 @@ -.\" Automatically generated by Pandoc 3.1.6 +.\" Automatically generated by Pandoc 3.1.11.1 .\" -.\" Define V font for inline verbatim, using C font in formats -.\" that render this, and otherwise B font. -.ie "\f[CB]x\f[]"x" \{\ -. ftr V B -. ftr VI BI -. ftr VB B -. ftr VBI BI -.\} -.el \{\ -. ftr V CR -. ftr VI CI -. ftr VB CB -. ftr VBI CBI -.\} .TH "DOWNGRADE" "8" "" "User Manual" "" -.hy .SH USAGE -.PP \f[B]downgrade\f[R] [option\&...] \ [pkg\&...] -[\f[B]--\f[R] pacman_option\&...] +[\f[B]\-\-\f[R] pacman_option\&...] .SH DESCRIPTION -.PP Downgrade Arch Linux packages. .SH OUTPUT -.PP Calling \f[B]downgrade\f[R] on a package will lead to the following output: .PP \f[I]Example:\f[R] .IP -.nf -\f[C] -- 1) terraform 0.11.11 2 remote -- 2) terraform 0.11.12 1 /var/cache/pacman/pkg +.EX +\- 1) terraform 0.11.11 2 remote +\- 2) terraform 0.11.12 1 /var/cache/pacman/pkg + 3) terraform 0.11.13 1 remote + 4) terraform 0.11.13 1 /var/cache/pacman/pkg -- 5) terraform 0.12.0 1 remote -- 6) terraform 0.12.0 1 /var/cache/pacman/pkg +\- 5) terraform 0.12.0 1 remote +\- 6) terraform 0.12.0 1 /var/cache/pacman/pkg 7) terraform 0.12.1 1 remote Available packages (community): 7/7 > -\f[R] -.fi +.EE .PP The columns have the following meaning: .PP -\f[I]indicator\f[R] Possible values: {-|+} +\f[I]indicator\f[R] Possible values: {\-|+} .PP -- indicates that the version was previously installed. +\- indicates that the version was previously installed. .PP + indicates the currently installed version. .PP \f[I]enumeration\f[R] An enumeration of the entries for selection. .PP -\f[I]package-name\f[R] The name of the package. +\f[I]package\-name\f[R] The name of the package. .PP -\f[I]package-epoch\f[R] The epoch of the package in cache or ALA. +\f[I]package\-epoch\f[R] The epoch of the package in cache or ALA. .PP -\f[I]package-version\f[R] The version of the package in cache or ALA. +\f[I]package\-version\f[R] The version of the package in cache or ALA. .PP -\f[I]package-release\f[R] The release of the package in cache or ALA. +\f[I]package\-release\f[R] The release of the package in cache or ALA. .PP \f[I]location\f[R] Possible values: {remote|/path/to/cache/dir} .PP @@ -71,8 +51,7 @@ If you have already downloaded this version, it will show the cache directory where the package is located. \f[I]remote\f[R] indicates that the version is available on the ALA. .SH OPTIONS -.PP -\f[B]--pacman\f[R] \f[I]\f[R] +\f[B]\-\-pacman\f[R] \f[I]\f[R] .PD 0 .P .PD @@ -81,7 +60,7 @@ directory where the package is located. Pacman command, default is \f[I]pacman\f[R]. .RE .PP -\f[B]--pacman-conf\f[R] \f[I]\f[R] +\f[B]\-\-pacman\-conf\f[R] \f[I]\f[R] .PD 0 .P .PD @@ -90,7 +69,7 @@ Pacman command, default is \f[I]pacman\f[R]. Pacman configuration file, default is \f[I]/etc/pacman.conf\f[R]. .RE .PP -\f[B]--pacman-cache\f[R] \f[I]\f[R] +\f[B]\-\-pacman\-cache\f[R] \f[I]\f[R] .PD 0 .P .PD @@ -102,7 +81,7 @@ This option can be specified multiple times to indicate multiple cache directories. .RE .PP -\f[B]--pacman-log\f[R] \f[I]\f[R] +\f[B]\-\-pacman\-log\f[R] \f[I]\f[R] .PD 0 .P .PD @@ -112,7 +91,7 @@ Pacman log file, default value is extracted from pacman configuration file, or otherwise defaults to \f[I]/var/log/pacman.log\f[R]. .RE .PP -\f[B]--maxdepth\f[R] \f[I]\f[R] +\f[B]\-\-maxdepth\f[R] \f[I]\f[R] .PD 0 .P .PD @@ -121,7 +100,7 @@ file, or otherwise defaults to \f[I]/var/log/pacman.log\f[R]. Maximum depth to search for cached packages, defaults to \f[I]1\f[R]. .RE .PP -\f[B]--ala-url\f[R] \f[I]\f[R] +\f[B]\-\-ala\-url\f[R] \f[I]\f[R] .PD 0 .P .PD @@ -131,7 +110,7 @@ Location of an ALA server, default is \f[I]https://archive.archlinux.org\f[R]. .RE .PP -\f[B]--ala-only\f[R] +\f[B]\-\-ala\-only\f[R] .PD 0 .P .PD @@ -140,7 +119,7 @@ Location of an ALA server, default is Search ALA only. .RE .PP -\f[B]--cached-only\f[R] +\f[B]\-\-cached\-only\f[R] .PD 0 .P .PD @@ -149,7 +128,7 @@ Search ALA only. Search local cache only. .RE .PP -\f[B]--ignore\f[R] \f[I]\f[R] +\f[B]\-\-ignore\f[R] \f[I]\f[R] .PD 0 .P .PD @@ -158,7 +137,7 @@ Search local cache only. Whether to add packages to IgnorePkg, default is \f[I]prompt\f[R]. .RE .PP -\f[B]--latest | \[en]oldest\f[R] +\f[B]\-\-latest | \-\-oldest\f[R] .PD 0 .P .PD @@ -167,10 +146,10 @@ Whether to add packages to IgnorePkg, default is \f[I]prompt\f[R]. Never prompt for version or location, automatically pick the most up to date/most out of date version. Allows for noninteractive downgrades when used in conjunction with -\[en]ignore +\f[CR]\-\-ignore\f[R]. .RE .PP -\f[B]--prefer-cache\f[R] +\f[B]\-\-prefer\-cache\f[R] .PD 0 .P .PD @@ -178,11 +157,11 @@ Allows for noninteractive downgrades when used in conjunction with .PP If a package matching the version filter is found in the cache, skip querying ala. -Unlike \[en]cached-only, \[en]prefer-cache does query ala if no package -could be matched in cache. +Unlike \[en]cached\-only, \[en]prefer\-cache does query ala if no +package could be matched in cache. .RE .PP -\f[B]--version\f[R] +\f[B]\-\-version\f[R] .PD 0 .P .PD @@ -191,7 +170,7 @@ could be matched in cache. Show downgrade version. .RE .PP -\f[B]-h, --help\f[R] +\f[B]\-h, \-\-help\f[R] .PD 0 .P .PD @@ -200,35 +179,30 @@ Show downgrade version. Show help script. .RE .SS CONFIGURATION FILE -.PP -Command-line options can be set persistently in +Command\-line options can be set persistently in \f[B]/etc/xdg/downgrade/downgrade.conf\f[R]. Note that these options are parsed first by \f[B]downgrade\f[R], -followed by any other command-line options provided by the user. +followed by any other command\-line options provided by the user. .SS PACMAN OPTIONS -.PP -As per the usage syntax, any options supplied after the \f[B]--\f[R] +As per the usage syntax, any options supplied after the \f[B]\-\-\f[R] character sequence will be treated as pacman options. .SS DEFAULT BEHAVIORS -.PP By default, \f[B]downgrade\f[R] will search both local caches and the ALA. .PP If only one package with its corresponding location matches, the package will be installed without further prompt from the user. .SH VERSION FILTERING -.PP -\f[B]downgrade\f[R] allows the use of the following version-filtering +\f[B]downgrade\f[R] allows the use of the following version\-filtering operators: \f[B]=\f[R], \f[B]==\f[R], \f[B]=\[ti]\f[R], \f[B]<=\f[R], \f[B]>=\f[R], \f[B]<\f[R] and \f[B]>\f[R]. Note that \f[B]=\[ti]\f[R] represents a regex match operator and \f[B]=\f[R]/\f[B]==\f[R] are aliases. .SH EXIT CODES -.PP -\f[B]downgrade\f[R] will stop further processing and exit non-zero if it -encounters any of the following scenarios for any of its arguments: +\f[B]downgrade\f[R] will stop further processing and exit non\-zero if +it encounters any of the following scenarios for any of its arguments: .IP \[bu] 2 -Execution from non-root user +Execution from non\-root user .IP \[bu] 2 No argument value(s) supplied where necessary .IP \[bu] 2 @@ -236,23 +210,25 @@ No package(s) found .IP \[bu] 2 Package(s) found, but an invalid selection was made .IP \[bu] 2 -\f[V]pacman -U\f[R] returned non-zero +\f[CR]pacman \-U\f[R] returned non\-zero .IP \[bu] 2 -Unexpected error when handling \f[V]IgnorePkg\f[R] additions +Unexpected error when handling \f[CR]IgnorePkg\f[R] additions .SH SEE ALSO -.PP \f[B]pacman\f[R](8), \f[B]vercmp(8)\f[R], \f[B]sudo\f[R](8), \f[B]pacman.conf\f[R](5), \f[B]find\f[R](1), \f[B]su\f[R](1), \f[B]fzf\f[R](1). .SH BUGS -.PP Open a GitHub issue on -\f[I]https://github.com/archlinux-downgrade/downgrade\f[R]. +\f[I]https://github.com/archlinux\-downgrade/downgrade\f[R]. .SH AUTHORS .IP \[bu] 2 -Patrick Brisbin +Patrick Brisbin \c +.MT pbrisbin@gmail.com +.ME \c .PD 0 .P .PD .IP \[bu] 2 -Atreya Shankar +Atreya Shankar \c +.MT shankar.atreya@gmail.com +.ME \c diff --git a/doc/downgrade.8.md b/doc/downgrade.8.md index 3dbd9a1..21d4090 100644 --- a/doc/downgrade.8.md +++ b/doc/downgrade.8.md @@ -100,7 +100,7 @@ on the ALA. **\--prefer-cache**\ > If a package matching the version filter is found in the cache, skip querying -> ala. Unlike --cached-only, --prefer-cache does query ala if no package could +> ala. Unlike `--cached-only`, `--prefer-cache` does query ala if no package could > be matched in cache. **\--version**\