From 41b41c81bda73dd82adfe4105c0c043c3a816024 Mon Sep 17 00:00:00 2001
From: Cassidy James Blaede <cassidy@endlessos.org>
Date: Thu, 20 Jul 2023 17:56:08 -0600
Subject: [PATCH] WIP: Install Flatpaks

---
 Containerfile                                     |  4 +++-
 etc/flatpaks                                      |  1 +
 etc/systemd/system/flatpak-system-install.service | 10 ++++++++++
 flatpaks                                          |  1 -
 usr/bin/ublue-flatpak-system-install              |  5 +++++
 5 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 etc/flatpaks
 create mode 100644 etc/systemd/system/flatpak-system-install.service
 delete mode 100644 flatpaks
 create mode 100755 usr/bin/ublue-flatpak-system-install

diff --git a/Containerfile b/Containerfile
index 1df26ab..0c26758 100644
--- a/Containerfile
+++ b/Containerfile
@@ -12,7 +12,6 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 COPY etc /etc
 COPY usr /usr
 
-ADD flatpaks /tmp/flatpaks
 ADD packages.json /tmp/packages.json
 ADD build.sh /tmp/build.sh
 
@@ -20,6 +19,9 @@ RUN /tmp/build.sh && \
     wget https://copr.fedorainfracloud.org/coprs/ublue-os/gnome-software/repo/fedora-${FEDORA_VERSION}/ublue-os-gnome-software-fedora-${FEDORA_VERSION}.repo -O /etc/yum.repos.d/ublue-os-gnome-software.repo && \
     rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:gnome-software gnome-software gnome-software-rpm-ostree && \
     pip install --prefix=/usr yafti && \
+    cat /etc/flatpaks | while read line; do flatpak install --system --noninteractive --no-deploy flathub $line; done && \
+    systemctl unmask flatpak-system-install.service && \
+    systemctl enable flatpak-system-install.service && \
     systemctl unmask dconf-update.service && \
     systemctl enable dconf-update.service && \
     systemctl enable rpm-ostree-countme.service && \
diff --git a/etc/flatpaks b/etc/flatpaks
new file mode 100644
index 0000000..f81e10f
--- /dev/null
+++ b/etc/flatpaks
@@ -0,0 +1 @@
+org.learningequality.Kolibri
\ No newline at end of file
diff --git a/etc/systemd/system/flatpak-system-install.service b/etc/systemd/system/flatpak-system-install.service
new file mode 100644
index 0000000..a6a7e7a
--- /dev/null
+++ b/etc/systemd/system/flatpak-system-install.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Install System Flatpak on boot
+Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/ublue-flatpak-system-install
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/flatpaks b/flatpaks
deleted file mode 100644
index 58497b4..0000000
--- a/flatpaks
+++ /dev/null
@@ -1 +0,0 @@
-org.learningequality.Kolibri
diff --git a/usr/bin/ublue-flatpak-system-install b/usr/bin/ublue-flatpak-system-install
new file mode 100755
index 0000000..47abf8e
--- /dev/null
+++ b/usr/bin/ublue-flatpak-system-install
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cat /etc/flatpaks | while read line; do
+  flatpak install --system --noninteractive --no-pull flathub $line
+done && mv /etc/flatpaks /etc/flatpaks.installed
\ No newline at end of file