Merge pull request #279 from ublue-os/flatpak-system-install-enhancements

feat(flatpak-manager): Improve flatpak management

Containerfile

@@ -181,8 +181,8 @@ RUN rm /usr/share/applications/shredder.desktop && \
     systemctl enable displaylink.service && \
     systemctl enable btrfs-dedup@var-home.timer && \
     systemctl enable input-remapper.service && \
-    systemctl unmask flatpak-system-install.service && \
-    systemctl enable flatpak-system-install.service && \
+    systemctl unmask bazzite-flatpak-manager.service && \
+    systemctl enable bazzite-flatpak-manager.service && \
     systemctl disable rpm-ostreed-automatic.timer && \
     systemctl --global enable ublue-update.timer && \
     systemctl enable bazzite-hardware-setup.service && \

system_files/desktop/shared/etc/systemd/system/bazzite-flatpak-manager.service

@@ -1,12 +1,12 @@
 [Unit]
-Description=Install System Flatpak on boot
+Description=Manage system flatpaks
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
 Wants=network-online.target
 After=network-online.target bazzite-hardware-setup.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/ublue-flatpak-system-install
+ExecStart=/usr/bin/bazzite-flatpak-manager
 Restart=on-failure
 
 [Install]

system_files/desktop/shared/usr/bin/bazzite-flatpak-manager

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+source /etc/default/bazzite
+
+# Script Version
+VER=1
+VER_FILE="/etc/bazzite/flatpak_manager_version"
+VER_RAN=$(cat $VER_FILE)
+
+# Run script if updated
+if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
+  echo "Flatpak manager v$VER has already ran. Exiting..."
+  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
+
+# Lists of flatpaks
+FLATPAK_LIST=$(flatpak list --column=application)
+INSTALL_LIST=$(cat /usr/etc/flatpak/install)
+REMOVE_LIST=$(cat /usr/etc/flatpak/remove)
+
+# Install flatpaks in list
+if [[ -n $INSTALL_LIST ]]; then
+  for flatpak in $INSTALL_LIST; do
+    if grep -qvz $flatpak <<< $FLATPAK_LIST; then
+      flatpak install --system --noninteractive flathub $flatpak
+    fi
+  done
+fi
+
+# Remove flatpaks in list
+if [[ -n $REMOVE_LIST ]]; then
+  for flatpak in $REMOVE_LIST; do
+    if grep -qz $flatpak <<< $FLATPAK_LIST; then
+      flatpak remove --system --noninteractive $flatpak
+    fi
+  done
+fi
+
+mkdir -p /etc/bazzite
+echo $VER > $VER_FILE

system_files/desktop/shared/usr/bin/ublue-flatpak-system-install

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-source /etc/default/bazzite
-
-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
-
-if [[ -f '/etc/flatpak/install' ]]; then
-  cat /etc/flatpak/install | while read line; do
-    flatpak install --system --noninteractive flathub $line
-  done && mv /etc/flatpak/install /etc/flatpak/installed
-fi
-
-if [[ -f '/etc/flatpak/remove' ]]; then
-  cat /etc/flatpak/remove | while read line; do
-    flatpak remove --system --noninteractive $line 2>/dev/null
-  done
-  mv /etc/flatpak/remove /etc/flatpak/removed
-fi
-
-rm -rf /etc/flatpak/{flathub,objects}