fix: make removing flatpaks a little safer (#553)

ublue-os · Oct 1, 2023 · ccfb8dd · ccfb8dd
1 parent dcc6b0c
commit ccfb8dd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/usr/bin/ublue-system-flatpak-manager b/usr/bin/ublue-system-flatpak-manager
@@ -11,13 +11,6 @@ if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
   exit 0
 fi
 
-# Opt out of and remove Fedora's flatpak repo
-if grep -qz 'fedora' <<< $(flatpak remotes); then
-  /usr/lib/fedora-third-party/fedora-third-party-opt-out
-  /usr/bin/fedora-third-party disable
-  flatpak remote-delete fedora --force
-fi
-
 notify-send "Flatpak installer" "Currently installing system flatpaks" --app-name="Flatpak installer" -u NORMAL
 
 # Remove fedora flatpak repo
@@ -50,5 +43,17 @@ if [[ -n $REMOVE_LIST ]]; then
   done
 fi
 
+# Opt out of and remove Fedora's flatpak repo
+if grep -qz 'fedora' <<< $(flatpak remotes); then
+  /usr/lib/fedora-third-party/fedora-third-party-opt-out
+  /usr/bin/fedora-third-party disable
+  flatpak remote-delete fedora --force
+
+  FEDORA_FLATPAKS=$(flatpak list --columns=application,origin | grep -w 'fedora' | awk '{print $1}')
+  for flatpak in $FEDORA_FLATPAKS; do
+    flatpak remove --system --noninteractive $flatpak
+  done
+fi
+
 mkdir -p /etc/ublue
 echo $VER > $VER_FILE
diff --git a/usr/bin/ublue-system-setup b/usr/bin/ublue-system-setup
@@ -99,12 +99,6 @@ if [[ -f $HWS_VER_FILE && $HWS_VER = $HWS_VER_RAN ]]; then
   fi
 fi
 
-# Remove system flatpaks
-if flatpak remotes --system | grep -q fedora; then
-    flatpak remote-delete fedora --force
-    flatpak remove --system --noninteractive --all
-fi
-
 echo $HWS_VER > $HWS_VER_FILE
 echo $IMAGE_NAME > $KNOWN_IMAGE_NAME_FILE
 echo $IMAGE_FLAVOR > $KNOWN_IMAGE_FLAVOR_FILE