Merge branch 'Antiz96:main' into main

Delor3an91 · Jan 22, 2025 · ae341b1 · ae341b1
2 parents fcc47f5 + 1960ddd
commit ae341b1
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v3.6.1](https://github.com/Antiz96/arch-update/releases/tag/v3.6.1) - 2025-01-22
+
+### Fixes
+
+- Filter out ignored packages when checking for AUR packages update with paru ([#305](https://github.com/Antiz96/arch-update/pull/305)) - ([8252253](https://github.com/Antiz96/arch-update/commit/8252253c8048b501b42363ddbe5b324dce8a4cf9)) by @Antiz96
+
+### Miscellaneous
+
+- Update translations files ([#306](https://github.com/Antiz96/arch-update/pull/306)) - ([bb7a435](https://github.com/Antiz96/arch-update/commit/bb7a4359e34fdaac265e963600e8c44df056e410)) by @Antiz96
+
 ## [v3.6.0](https://github.com/Antiz96/arch-update/releases/tag/v3.6.0) - 2025-01-21
 
 ### Features

diff --git a/doc/man/arch-update.1.scd b/doc/man/arch-update.1.scd
@@ -1,4 +1,4 @@
-arch-update(1) ["Arch-Update 3.6.0" ["Arch-Update Manual"]]
+arch-update(1) ["Arch-Update 3.6.1" ["Arch-Update Manual"]]
 
 # NAME
 

diff --git a/doc/man/arch-update.conf.5.scd b/doc/man/arch-update.conf.5.scd
@@ -1,4 +1,4 @@
-arch-update.conf(5) ["Arch-Update 3.6.0" ["Arch-Update Manual"]]
+arch-update.conf(5) ["Arch-Update 3.6.1" ["Arch-Update Manual"]]
 
 # NAME
 

diff --git a/doc/man/fr/arch-update.1.scd b/doc/man/fr/arch-update.1.scd
@@ -1,4 +1,4 @@
-arch-update(1) ["Arch-Update 3.6.0" ["Manuel de Arch-Update"]]
+arch-update(1) ["Arch-Update 3.6.1" ["Manuel de Arch-Update"]]
 
 # NOM
 

diff --git a/doc/man/fr/arch-update.conf.5.scd b/doc/man/fr/arch-update.conf.5.scd
@@ -1,4 +1,4 @@
-arch-update.conf(5) ["Arch-Update 3.6.0" ["Manuel de Arch-Update"]]
+arch-update.conf(5) ["Arch-Update 3.6.1" ["Manuel de Arch-Update"]]
 
 # NOM
 

diff --git a/po/arch-update.pot b/po/arch-update.pot
@@ -6,7 +6,7 @@
 # AUTHOR <EMAIL@ADDRESS>, YEAR
 msgid ""
 msgstr ""
-"Project-Id-Version: Arch-Update 3.6.0\n"
+"Project-Id-Version: Arch-Update 3.6.1\n"
 "Report-Msgid-Bugs-To: https://github.com/Antiz96/arch-update/issues\n"
 "POT-Creation-Date: 2024-03-17 16:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/check.sh:39 src/lib/check.sh:42
+#: src/lib/check.sh:37 src/lib/check.sh:40
 #, sh-format
 msgid "${update_number} update available"
 msgstr ""
 
-#: src/lib/check.sh:47 src/lib/check.sh:49
+#: src/lib/check.sh:45 src/lib/check.sh:47
 #, sh-format
 msgid "${update_number} updates available"
 msgstr ""
@@ -49,8 +49,8 @@ msgstr ""
 #: src/lib/common.sh:126
 #, sh-format
 msgid ""
-"The ${aur_helper} AUR helper set for AUR packages support in the arch-update."
-"conf configuration file is not found\\n"
+"The ${aur_helper} AUR helper set for AUR packages support in the arch-"
+"update.conf configuration file is not found\\n"
 msgstr ""
 
 #: src/lib/common.sh:148
@@ -288,9 +288,9 @@ msgstr ""
 #: src/lib/list_news.sh:12
 #, sh-format
 msgid ""
-"Unable to retrieve recent Arch News (HTTP error response or request "
-"timeout)\\nPlease, look for any recent news at https://archlinux.org before "
-"updating your system"
+"Unable to retrieve recent Arch News (HTTP error response or request timeout)"
+"\\nPlease, look for any recent news at https://archlinux.org before updating "
+"your system"
 msgstr ""
 
 #: src/lib/list_news.sh:22

diff --git a/po/fr.po b/po/fr.po
@@ -6,7 +6,7 @@
 # Robin Candau <[email protected]>, 2024
 msgid ""
 msgstr ""
-"Project-Id-Version: Arch-Update 3.6.0\n"
+"Project-Id-Version: Arch-Update 3.6.1\n"
 "Report-Msgid-Bugs-To: https://github.com/Antiz96/arch-update/issues\n"
 "POT-Creation-Date: 2024-03-17 16:22+0100\n"
 "PO-Revision-Date: 2024-05-09 09:30+0100\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/check.sh:39 src/lib/check.sh:42
+#: src/lib/check.sh:37 src/lib/check.sh:40
 #, sh-format
 msgid "${update_number} update available"
 msgstr "${update_number} mise à jour disponible"
 
-#: src/lib/check.sh:47 src/lib/check.sh:49
+#: src/lib/check.sh:45 src/lib/check.sh:47
 #, sh-format
 msgid "${update_number} updates available"
 msgstr "${update_number} mises à jour disponibles"
@@ -49,8 +49,8 @@ msgstr "Appuyez sur \"entrée\" pour quitter "
 #: src/lib/common.sh:126
 #, sh-format
 msgid ""
-"The ${aur_helper} AUR helper set for AUR packages support in the arch-update."
-"conf configuration file is not found\\n"
+"The ${aur_helper} AUR helper set for AUR packages support in the arch-"
+"update.conf configuration file is not found\\n"
 msgstr ""
 "Le AUR helper ${aur_helper} défini pour le support des paquets AUR dans le fichier de configuration "
 "arch-update.conf n'est pas disponible\\n"
@@ -333,9 +333,9 @@ msgstr "Recherche des Arch News récentes..."
 #: src/lib/list_news.sh:12
 #, sh-format
 msgid ""
-"Unable to retrieve recent Arch News (HTTP error response or request "
-"timeout)\\nPlease, look for any recent news at https://archlinux.org before "
-"updating your system"
+"Unable to retrieve recent Arch News (HTTP error response or request timeout)"
+"\\nPlease, look for any recent news at https://archlinux.org before updating "
+"your system"
 msgstr ""
 "Impossible de récupérer les Arch News récentes (réponse HTTP en erreur ou délai "
 "d'attente de la demande dépassé)\\nVeuillez consultez les dernières "

diff --git a/po/sv.po b/po/sv.po
@@ -6,7 +6,7 @@
 # Luna Jernberg <[email protected]>, 2024
 msgid ""
 msgstr ""
-"Project-Id-Version: Arch-Update 3.6.0\n"
+"Project-Id-Version: Arch-Update 3.6.1\n"
 "Report-Msgid-Bugs-To: https://github.com/Antiz96/arch-update/issues\n"
 "POT-Creation-Date: 2024-03-17 16:22+0100\n"
 "PO-Revision-Date: 2024-11-19 12:22+0100\n"
@@ -16,14 +16,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.6.0\n"
+"X-Generator: Poedit 3.6.1\n"
 
-#: src/lib/check.sh:39 src/lib/check.sh:42
+#: src/lib/check.sh:37 src/lib/check.sh:40
 #, sh-format
 msgid "${update_number} update available"
 msgstr "${update_number} uppdatering är tillgänglig"
 
-#: src/lib/check.sh:47 src/lib/check.sh:49
+#: src/lib/check.sh:45 src/lib/check.sh:47
 #, sh-format
 msgid "${update_number} updates available"
 msgstr "${update_number} uppdateringar är tillgängliga"
@@ -51,8 +51,8 @@ msgstr "Tryck på \"enter\" för att avsluta "
 #: src/lib/common.sh:126
 #, sh-format
 msgid ""
-"The ${aur_helper} AUR helper set for AUR packages support in the arch-update."
-"conf configuration file is not found\\n"
+"The ${aur_helper} AUR helper set for AUR packages support in the arch-"
+"update.conf configuration file is not found\\n"
 msgstr ""
 "${aur_helper} Den inställda AUR-hjälparen för stöd för AUR-paket i "
 "konfigurationsfilen arch-update.conf hittades inte\\n"
@@ -339,9 +339,9 @@ msgstr "Letar du efter de senaste Arch-nyheterna..."
 #: src/lib/list_news.sh:12
 #, sh-format
 msgid ""
-"Unable to retrieve recent Arch News (HTTP error response or request "
-"timeout)\\nPlease, look for any recent news at https://archlinux.org before "
-"updating your system"
+"Unable to retrieve recent Arch News (HTTP error response or request timeout)"
+"\\nPlease, look for any recent news at https://archlinux.org before updating "
+"your system"
 msgstr ""
 "Det gick inte att hämta de senaste Arch-nyheterna (HTTP-felsvar eller "
 "timeout för begäran)\\nVänligen leta efter några av det senaste nyheterna på "

diff --git a/src/arch-update.sh b/src/arch-update.sh
@@ -7,7 +7,7 @@
 # General variables
 name="arch-update"
 _name="Arch-Update"
-version="3.6.0"
+version="3.6.1"
 option="${1}"
 
 # Define the directory containing libraries

diff --git a/src/lib/check.sh b/src/lib/check.sh
@@ -5,9 +5,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ -n "${aur_helper}" ] && [ -n "${flatpak_support}" ]; then
-	update_available=$(checkupdates ; "${aur_helper}" -Qua 2> /dev/null | sed 's/^ *//' | sed 's/ \+/ /g' ; flatpak update | sed -n '/^ 1./,$p' | awk '{print $2}' | grep -v '^$' | sed '$d')
+	update_available=$(checkupdates ; "${aur_helper}" -Qua 2> /dev/null | sed 's/^ *//' | sed 's/ \+/ /g' | grep -vw "\[ignored\]$" ; flatpak update | sed -n '/^ 1./,$p' | awk '{print $2}' | grep -v '^$' | sed '$d')
 elif [ -n "${aur_helper}" ] && [ -z "${flatpak_support}" ]; then
-	update_available=$(checkupdates ; "${aur_helper}" -Qua 2> /dev/null | sed 's/^ *//' | sed 's/ \+/ /g')
+	update_available=$(checkupdates ; "${aur_helper}" -Qua 2> /dev/null | sed 's/^ *//' | sed 's/ \+/ /g' | grep -vw "\[ignored\]$")
 elif [ -z "${aur_helper}" ] && [ -n "${flatpak_support}" ]; then
 	update_available=$(checkupdates ; flatpak update | sed -n '/^ 1./,$p' | awk '{print $2}' | grep -v '^$' | sed '$d')
 else

diff --git a/src/lib/list_packages.sh b/src/lib/list_packages.sh
@@ -17,10 +17,10 @@ fi
 if [ -n "${aur_helper}" ]; then
 	if [ -z "${no_version}" ]; then
 		# shellcheck disable=SC2154
-		aur_packages=$("${aur_helper}" --color "${pacman_color_opt}" "${devel_flag[@]}" -Qua 2> /dev/null | sed 's/^ *//' | sed 's/ \+/ /g')
+		aur_packages=$("${aur_helper}" --color "${pacman_color_opt}" "${devel_flag[@]}" -Qua 2> /dev/null | sed 's/^ *//' | sed 's/ \+/ /g' | grep -vw "\[ignored\]$")
 	else
 		# shellcheck disable=SC2154
-		aur_packages=$("${aur_helper}" --color "${pacman_color_opt}" "${devel_flag[@]}" -Qua 2> /dev/null | sed 's/^ *//' | sed 's/ \+/ /g' | awk '{print $1}')
+		aur_packages=$("${aur_helper}" --color "${pacman_color_opt}" "${devel_flag[@]}" -Qua 2> /dev/null | sed 's/^ *//' | sed 's/ \+/ /g' | grep -vw "\[ignored\]$" | awk '{print $1}')
 	fi
 fi