Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

fix: flatpak-manager may fail on removal #586

Merged
merged 1 commit into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions usr/bin/ublue-system-flatpak-manager
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ if grep -qz 'fedora' <<< $(flatpak remotes); then

FEDORA_FLATPAKS=$(flatpak list --columns=application,origin | grep -w 'fedora' | awk '{print $1}')
for flatpak in $FEDORA_FLATPAKS; do
if ! flatpak remove --system --noninteractive $flatpak; then
# exit on error
exit 1
fi
flatpak remove --system --noninteractive $flatpak
done
fi

Expand Down
5 changes: 1 addition & 4 deletions usr/bin/ublue-user-flatpak-manager
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ fi
if [[ -n $REMOVE_LIST ]]; then
for flatpak in $REMOVE_LIST; do
if grep -qz $flatpak <<< $FLATPAK_LIST; then
if ! flatpak remove --user --noninteractive $flatpak; then
# exit on error
exit 1
fi
flatpak remove --user --noninteractive $flatpak
fi
done
fi
Expand Down
2 changes: 2 additions & 0 deletions usr/etc/flatpak/system/remove
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
org.gnome.Cheese
org.gnome.eog
2 changes: 0 additions & 2 deletions usr/etc/flatpak/user/remove
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
org.gnome.Cheese
org.gnome.eog