fix: flatpak-manager may fail on removal (#586)

ublue-os · Oct 13, 2023 · 9b23bd1 · 9b23bd1
1 parent 1e68ee3
commit 9b23bd1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/usr/bin/ublue-system-flatpak-manager b/usr/bin/ublue-system-flatpak-manager
@@ -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
 

diff --git a/usr/bin/ublue-user-flatpak-manager b/usr/bin/ublue-user-flatpak-manager
@@ -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

diff --git a/usr/etc/flatpak/system/remove b/usr/etc/flatpak/system/remove
@@ -0,0 +1,2 @@
+org.gnome.Cheese
+org.gnome.eog
diff --git a/usr/etc/flatpak/user/remove b/usr/etc/flatpak/user/remove
@@ -1,2 +0,0 @@
-org.gnome.Cheese
-org.gnome.eog