From 81923137b326a73e395bddfb00aadd1790eb5ca5 Mon Sep 17 00:00:00 2001
From: humocs-man <251756307+humocs-man@users.noreply.github.com>
Date: Thu, 12 Mar 2026 21:09:19 +0100
Subject: [PATCH] Update firstboot-setup.sh

---
 .../etc/skel/.config/firstboot/firstboot-setup.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/files/etc/skel/.config/firstboot/firstboot-setup.sh b/files/etc/skel/.config/firstboot/firstboot-setup.sh
index 8b8bb35..b9978b0 100644
--- a/files/etc/skel/.config/firstboot/firstboot-setup.sh
+++ b/files/etc/skel/.config/firstboot/firstboot-setup.sh
@@ -4,14 +4,14 @@ set -euo pipefail
 DIALOG=dialog
 HEIGHT=20
 WIDTH=74
-LOG="/var/log/firstboot-setup.log"
+LOG="$HOME/.local/state/firstboot-setup.log"
+
 
 
 if [[ -z "${TERM:-}" ]]; then
-  exec cosmic-terminal -- /usr/libexec/firstboot-setup.sh
+  exec cosmic-terminal -- "$HOME/.config/firstboot/firstboot-user.sh"
 fi
 
-
 exec > >(tee -a "$LOG") 2>&1
 
 abort() {
@@ -28,12 +28,14 @@ wirklich abbrechen?" \
 $HEIGHT $WIDTH
 
   if [[ $? -eq 0 ]]; then
-    systemctl start firstboot-cleanup.service
+    rm -f "$HOME/.config/firstboot/run"
     systemctl --user disable firstboot-setup.service
     clear
     exit 0
   fi
 
+  fi
+
   # User hat sich gegen Abbruch entschieden → zurück
   return 0
 }
@@ -293,8 +295,9 @@ $HEIGHT $WIDTH 0
 # ----------------------------
 # Mark wizard as done
 # ----------------------------
-systemctl start firstboot-cleanup.service
-systemctl --user disable firstboot-setup.service
+rm -f "$HOME/.config/firstboot/run"
+systemctl --user disable firstboot-user.service
+
 
 $DIALOG --title "Fertig" --msgbox \
 "Die Einrichtung ist abgeschlossen.