From 64e38e7400d844fb05f9c33935269608b5a3b087 Mon Sep 17 00:00:00 2001
From: Simon Rieger <simono41@brothertec.eu>
Date: Wed, 19 Jul 2023 14:42:43 +0200
Subject: [PATCH] fix startupscripts

---
 dot_zprofile                             | 36 ++--------------
 scripts/executable_set-systemsettings.sh | 54 ++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 33 deletions(-)
 create mode 100644 scripts/executable_set-systemsettings.sh

diff --git a/dot_zprofile b/dot_zprofile
index 72d2479..764e18e 100644
--- a/dot_zprofile
+++ b/dot_zprofile
@@ -7,41 +7,11 @@ if [[ -z $DISPLAY && $(tty) == /dev/tty1 && $XDG_SESSION_TYPE == tty ]]; then
     done
 
     # set systemconfiguration
-
-    if ! cat /etc/locale.conf | grep LANG=${lang}.UTF-8 1>/dev/null 2>&1; then
-        echo "LANG=${lang}.UTF-8" > /etc/locale.conf
-        echo "LC_COLLATE=C" >> /etc/locale.conf
-        echo "LANGUAGE=${lang}" >> /etc/locale.conf
-
-        echo "${lang}.UTF-8 UTF-8" > /etc/locale.gen
-        echo "${lang} ISO-8859-1" >> /etc/locale.gen
-        #echo "${lang}@euro ISO-8859-15" >> /etc/locale.gen
-        if ! grep 'en_US.UTF-8 UTF-8' /etc/locale.gen 1>/dev/null 2>&1; then
-            echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-        fi
-
-        locale-gen
-    fi
-
-    keytable_short="${keytable:0:2}"
-    echo "KEYMAP=${keytable_short}" > /etc/vconsole.conf
-    echo "FONT=lat9w-16" >> /etc/vconsole.conf
-    if [ -f "/etc/conf.d/keymaps" ]; then
-        sed -i 's/keymap=.*$/keymap=\"'$keytable_short'\"/' /etc/conf.d/keymaps
-    fi
-
-    sed -e 's|Option "XkbLayout".*$|Option "XkbLayout" "'$keytable_short'"|' -i /etc/X11/xorg.conf.d/20-keyboard.conf
-    if [ "$keytable_short" != "de" ]; then
-        sed -e 's|    xkb_layout.*$|    xkb_layout '$keytable_short',de|' -i /home/${user}/.config/sway/config
-    fi
-
-    # https://stackoverflow.com/questions/5767062/how-to-check-if-a-symlink-exists
-    if [ -L /etc/localtime ]; then
-        rm /etc/localtime
-    fi
-    ln -s /usr/share/zoneinfo/"${tz}" /etc/localtime
+    echo "set systemconfiguration"
+    sudo scripts/set-systemsettings.sh
 
     # Set global environments
+    echo "set global environments"
 
     export QT_QPA_PLATFORMTHEME=qt6ct
 
diff --git a/scripts/executable_set-systemsettings.sh b/scripts/executable_set-systemsettings.sh
new file mode 100644
index 0000000..dcb70c1
--- /dev/null
+++ b/scripts/executable_set-systemsettings.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -e
+
+user=user1
+
+if cat /etc/passwd | grep "x:1000" > /dev/null; then
+    tempuser=$(cat /etc/passwd | grep "x:1000" | awk '{print $1}')
+    user=${tempuser%%:*}
+#else
+#    user=$(whoami)
+fi
+
+for wort in $(cat /proc/cmdline)
+do
+    echo "Parameter ${wort%=*} = ${wort#*=}"
+    if ! export ${wort%=*}=${wort#*=}; then echo "cannot export ${wort}!!!"; fi
+done
+
+# set systemconfiguration
+
+if ! cat /etc/locale.conf | grep LANG=${lang}.UTF-8 1>/dev/null 2>&1; then
+    echo "LANG=${lang}.UTF-8" > /etc/locale.conf
+    echo "LC_COLLATE=C" >> /etc/locale.conf
+    echo "LANGUAGE=${lang}" >> /etc/locale.conf
+
+    echo "${lang}.UTF-8 UTF-8" > /etc/locale.gen
+    echo "${lang} ISO-8859-1" >> /etc/locale.gen
+    #echo "${lang}@euro ISO-8859-15" >> /etc/locale.gen
+    if ! grep 'en_US.UTF-8 UTF-8' /etc/locale.gen 1>/dev/null 2>&1; then
+        echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+    fi
+
+    locale-gen
+fi
+
+keytable_short="${keytable:0:2}"
+echo "KEYMAP=${keytable_short}" > /etc/vconsole.conf
+echo "FONT=lat9w-16" >> /etc/vconsole.conf
+if [ -f "/etc/conf.d/keymaps" ]; then
+    sed -i 's/keymap=.*$/keymap=\"'$keytable_short'\"/' /etc/conf.d/keymaps
+fi
+
+sed -e 's|Option "XkbLayout".*$|Option "XkbLayout" "'$keytable_short'"|' -i /etc/X11/xorg.conf.d/20-keyboard.conf
+if [ "$keytable_short" != "de" ]; then
+    sed -e 's|    xkb_layout.*$|    xkb_layout '$keytable_short',de|' -i /home/${user}/.config/sway/config
+fi
+
+# https://stackoverflow.com/questions/5767062/how-to-check-if-a-symlink-exists
+if [ -L /etc/localtime ]; then
+    rm /etc/localtime
+fi
+ln -s /usr/share/zoneinfo/"${tz}" /etc/localtime
+