From 1c203cb6dd213d1a5566db9c0187029569d2be8b Mon Sep 17 00:00:00 2001
From: zelikos <pcsikos@zelikos.dev>
Date: Sat, 14 Oct 2023 13:06:37 -0400
Subject: [PATCH] fix(default-flatpaks): Only enable system/user services if
 respective repo is configured

---
 modules/default-flatpaks/default-flatpaks.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/default-flatpaks/default-flatpaks.sh b/modules/default-flatpaks/default-flatpaks.sh
index 42908a1..ab0bc8f 100644
--- a/modules/default-flatpaks/default-flatpaks.sh
+++ b/modules/default-flatpaks/default-flatpaks.sh
@@ -8,11 +8,6 @@ cp -r "$BLING_DIRECTORY"/files/usr/bin/user-flatpak-setup /usr/bin/user-flatpak-
 cp -r "$BLING_DIRECTORY"/files/usr/lib/systemd/system/system-flatpak-setup.service /usr/lib/systemd/system/system-flatpak-setup.service
 cp -r "$BLING_DIRECTORY"/files/usr/lib/systemd/user/user-flatpak-setup.service /usr/lib/systemd/user/user-flatpak-setup.service
 
-echo "Enabling flatpaks module"
-systemctl enable system-flatpak-setup.service
-systemctl enable --global user-flatpak-setup.service
-mkdir -p /usr/etc/flatpak/{system,user}
-
 configure_flatpak_repo () {
     CONFIG_FILE=$1
     INSTALL_LEVEL=$2
@@ -73,14 +68,19 @@ configure_lists () {
     fi
 }
 
+echo "Enabling flatpaks module"
+mkdir -p /usr/etc/flatpak/{system,user}
+
 # Check that `system` is present before configuring
 if [[ ! $(echo "$1" | yq -I=0 ".system") == "null" ]]; then
+    systemctl enable -f system-flatpak-setup.service
     configure_flatpak_repo "$1" "system"
     configure_lists "$1" "system"
 fi
 
 # Check that `user` is present before configuring
 if [[ ! $(echo "$1" | yq -I=0 ".user") == "null" ]]; then
+    systemctl enable -f --global user-flatpak-setup.service
     configure_flatpak_repo "$1" "user"
     configure_lists "$1" "user"
 fi