From d39adf72dfcc91dbe94dd693302dc07fac822624 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Fri, 25 Aug 2023 09:34:41 -0600
Subject: [PATCH] fix(user-setup): Ensure user always has working justfile

Backs up old file just in case there are user recipes there. Fixes https://github.com/ublue-os/bazzite/issues/186
---
 .../desktop/shared/usr/bin/bazzite-user-setup   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 2c585da1..983c1e32 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -1,6 +1,23 @@
 #!/usr/bin/env bash
 source /etc/default/bazzite
 
+if [[ -f "${HOME}/.justfile" ]]; then
+  if grep -Eqvz "main|nvidia|custom" "${HOME}/.justfile"; then
+    mv "${HOME}/.justfile" "${HOME}/.justfile.old"
+    cd /usr/share/ublue-os/just
+    for justfile in *.just; do
+      echo "!include ${PWD}/${justfile}" >> "${HOME}/.justfile"
+    done
+    cd ~
+  fi
+else
+  cd /usr/share/ublue-os/just
+  for justfile in *.just; do
+    echo "!include ${PWD}/${justfile}" >> "${HOME}/.justfile"
+  done
+  cd ~
+fi
+
 if [[ $BASE_IMAGE_NAME =~ "kinoite"  ]]; then
   echo 'Running setup for Kinoite'