From 8d1b3e12b45fcc7d3a0bd4fe37f4924df448c829 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:07:44 +0100
Subject: [PATCH] Fixed installation of jade-gui flatpak on ISO

---
 chrooted.sh                                          |  4 +++-
 crystal/airootfs/etc/buildstamp                      |  2 +-
 crystal/airootfs/etc/systemd/system/jade-gui.service | 12 ------------
 inject.sh                                            |  2 +-
 4 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 crystal/airootfs/etc/systemd/system/jade-gui.service

diff --git a/chrooted.sh b/chrooted.sh
index b820478..1ac9868 100755
--- a/chrooted.sh
+++ b/chrooted.sh
@@ -7,6 +7,9 @@ usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal
 usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root
 chsh -s /usr/bin/zsh crystal
 
+# Install Jade's GUI
+flatpak install -y --noninteractive /usr/share/jade-gui/jade-gui.flatpak
+
 # Desktop icon for Jade's GUI
 mkdir -p /home/crystal/Desktop
 cp /usr/share/applications/Jade.desktop /home/crystal/Desktop/Install.desktop
@@ -16,7 +19,6 @@ chown -R crystal:crystal /home/crystal/
 systemctl enable NetworkManager
 systemctl enable reflector
 systemctl enable gdm
-systemctl enable jade-gui
 
 # Hostname and Locale
 echo "crystal-live" > /etc/hostname
diff --git a/crystal/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp
index 227fcae..645edd7 100644
--- a/crystal/airootfs/etc/buildstamp
+++ b/crystal/airootfs/etc/buildstamp
@@ -1 +1 @@
-Built on 07/30/22 @ 00:03:09 EST
+Built on 07/30/22 @ 11:52:24 EST
diff --git a/crystal/airootfs/etc/systemd/system/jade-gui.service b/crystal/airootfs/etc/systemd/system/jade-gui.service
deleted file mode 100644
index ac8c902..0000000
--- a/crystal/airootfs/etc/systemd/system/jade-gui.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Installing Jade's GUI counterpart (This may take a while)
-Before=gdm.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/mount -o remount,size=2G /run/archiso/cowspace
-ExecStart=/bin/flatpak install -y --noninteractive /usr/share/jade-gui/jade-gui.flatpak
-
-[Install]
-WantedBy=multi-user.target
diff --git a/inject.sh b/inject.sh
index dece4e4..8268f48 100755
--- a/inject.sh
+++ b/inject.sh
@@ -6,7 +6,7 @@ echo "Chrooting to $1, and running chrooted.sh"
 cp chrooted.sh ${1}/.
 cp crystal/pacman.conf ${1}/.
 chmod +x ${1}/chrooted.sh
-chroot $1 /bin/bash -c ./chrooted.sh
+arch-chroot $1 /bin/bash -c ./chrooted.sh
 rm ${1}/chrooted.sh
 
 echo "inject.sh completed."