From 7476c272564220bd1319c0a930a8ac57d36583c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=C3=A4tzold?= <obel1x@web.de>
Date: Thu, 9 Apr 2026 14:17:53 +0200
Subject: [PATCH] Logon script setup: Moved to client software

---
 .../logon_script.sh.desktop                          |  7 +++++++
 .../0040_autostart_logon_script/user_run.sh          | 12 ++++++++++++
 system_setup/logon_script.sh                         |  8 --------
 system_setup/logon_script.sh.desktop                 |  7 -------
 4 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100755 client_software/0040_autostart_logon_script/logon_script.sh.desktop
 create mode 100755 client_software/0040_autostart_logon_script/user_run.sh
 delete mode 100755 system_setup/logon_script.sh.desktop

diff --git a/client_software/0040_autostart_logon_script/logon_script.sh.desktop b/client_software/0040_autostart_logon_script/logon_script.sh.desktop
new file mode 100755
index 0000000..f007f60
--- /dev/null
+++ b/client_software/0040_autostart_logon_script/logon_script.sh.desktop
@@ -0,0 +1,7 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Exec=/opt/sys_config/system_setup/logon_script.sh
+Icon=application-x-shellscript
+Name=User Logon Script
+Type=Application
+X-KDE-AutostartScript=true
diff --git a/client_software/0040_autostart_logon_script/user_run.sh b/client_software/0040_autostart_logon_script/user_run.sh
new file mode 100755
index 0000000..3ac534f
--- /dev/null
+++ b/client_software/0040_autostart_logon_script/user_run.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+# SPDX-FileCopyrightText: Daniel Pätzold
+# SPDX-License-Identifier: AGPL-3.0-or-later
+#
+#Copy current Version of Autostart-Entry
+rm -f "${HOME}/.config/autostart/logon_script.sh.desktop"
+cp "${SCRIPTPATH}/logon_script.sh.desktop" "${HOME}/.config/autostart"
+if [ $? -ne 0 ]; then
+    elog_add "Failed to setup autostart- entry. Check your installation of these scripts."
+    echo "Press any key to continue" && read -n 1 -s -r && exit 1
+fi
+exit 0
diff --git a/system_setup/logon_script.sh b/system_setup/logon_script.sh
index b370432..b3f1792 100755
--- a/system_setup/logon_script.sh
+++ b/system_setup/logon_script.sh
@@ -25,14 +25,6 @@ if [ $? -ne 0 ]; then
     echo "Press any key to continue" && read -n 1 -s -r && exit 1
 fi
 
-#Copy current Version of Autostart-Entry
-rm -f "${HOME}/.config/autostart/logon_script.sh.desktop"
-cp "${SCRIPTPATH}/logon_script.sh.desktop" "${HOME}/.config/autostart"
-if [ $? -ne 0 ]; then
-    elog_add "Failed to setup autostart- entry. Check your installation of these scripts."
-    echo "Press any key to continue" && read -n 1 -s -r && exit 1
-fi
-
 # Mount the private Directory
 elog_add_command "${SYSCONFIGPATH}/system_setup/mount_ecrypt_home.sh"
 if [ $? -ne 0 ]; then
diff --git a/system_setup/logon_script.sh.desktop b/system_setup/logon_script.sh.desktop
deleted file mode 100755
index 8a61511..0000000
--- a/system_setup/logon_script.sh.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Exec=/usr/bin/konsole --fullscreen --hide-tabbar --hide-menubar -e /opt/sys_config/system_setup/logon_script.sh
-Icon=application-x-shellscript
-Name=logon_script.sh
-Type=Application
-X-KDE-AutostartScript=true