Skip to content

Commit

Permalink
Make Flatpak packages updates detection more robust to avoid false po…
Browse files Browse the repository at this point in the history
…sitives (#104)

This commit aims to make the Flatpak updates detection more robust by filtering the 'flatpak update' command output to remove everything placed before the listing of available updates.
This avoid potential false positives in Arch-Update's listing as it ensure that everything placed above the listing of available updates in the 'flatpak update' output will not be included in the list (such as info, warning, etc...).

The complete output is still shown when the Flatpak updates are actually applied during the script, so users are still aware of potential info/warnings.

Fixes #103
  • Loading branch information
Antiz96 authored Feb 7, 2024
1 parent f4a55bc commit 5546c83
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/script/arch-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ check() {
icon_checking

if [ -n "${aur_helper}" ] && [ -n "${flatpak}" ]; then
update_available=$(checkupdates ; "${aur_helper}" -Qua ; flatpak update | awk '{print $2}' | grep -v '^$' | sed '1d;$d')
update_available=$(checkupdates ; "${aur_helper}" -Qua ; flatpak update | sed -n '/^ 1./,$p' | awk '{print $2}' | grep -v '^$' | sed '$d')
elif [ -n "${aur_helper}" ] && [ -z "${flatpak}" ]; then
update_available=$(checkupdates ; "${aur_helper}" -Qua)
elif [ -z "${aur_helper}" ] && [ -n "${flatpak}" ]; then
update_available=$(checkupdates ; flatpak update | awk '{print $2}' | grep -v '^$' | sed '1d;$d')
update_available=$(checkupdates ; flatpak update | sed -n '/^ 1./,$p' | awk '{print $2}' | grep -v '^$' | sed '$d')
else
update_available=$(checkupdates)
fi
Expand Down Expand Up @@ -222,7 +222,7 @@ list_packages() {
fi

if [ -n "${flatpak}" ]; then
flatpak_packages=$(flatpak update | awk '{print $2}' | grep -v '^$' | sed '1d;$d')
flatpak_packages=$(flatpak update | sed -n '/^ 1./,$p' | awk '{print $2}' | grep -v '^$' | sed '$d')
fi

if [ -n "${packages}" ]; then
Expand Down

0 comments on commit 5546c83

Please sign in to comment.