From 15290cd0ec06cadfa925a606408d525589e7df1e Mon Sep 17 00:00:00 2001
From: user1 <user1@spectreos.de>
Date: Thu, 6 Apr 2023 14:43:46 +0200
Subject: [PATCH] set default uid and gid to 2000

---
 arch-graphical-install-auto.sh | 16 +++++++++-------
 arch-install.sh                |  4 ++--
 scripts/aurinstall.sh          |  4 ++--
 scripts/aurupdater.sh          |  4 ++--
 scripts/startup-script.sh      |  6 ++++--
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/arch-graphical-install-auto.sh b/arch-graphical-install-auto.sh
index fdd389f..8ea872d 100755
--- a/arch-graphical-install-auto.sh
+++ b/arch-graphical-install-auto.sh
@@ -34,9 +34,11 @@ do
     shift
 done
 
-if cat /etc/passwd | grep "x:1000" > /dev/null; then
-    tempuser=$(cat /etc/passwd | grep "x:1000" | awk '{print $1}')
+if cat /etc/passwd | grep "x:2000" > /dev/null; then
+    tempuser=$(cat /etc/passwd | grep "x:2000" | awk '{print $1}')
     user=${tempuser%%:*}
+#else
+#    user=$(whoami)
 fi
 
 function pacmanconf() {
@@ -104,8 +106,8 @@ function standartinstallation() {
 
 function addusers() {
     # Erstelle Gruppen
-    groupid=1000
-    for wort in users wheel audio input power storage video sys optical adm lp scanner sddm kvm fuse autologin network wireshark docker libvirt libvirtdbus; do
+    groupid=2000
+    for wort in master users wheel audio input power storage video sys optical adm lp scanner sddm kvm fuse autologin network wireshark docker libvirt libvirtdbus; do
         if ! cat /etc/group | grep ${wort}; then
             while cat /etc/group | grep ${groupid}; do
                 groupid=$((${groupid} + 1))
@@ -114,12 +116,12 @@ function addusers() {
         fi
     done
 
-    useruid=1000
+    useruid=2000
     while cat /etc/passwd | grep ${useruid}; do
         useruid=$((${useruid} + 1))
     done
 
-    useradd -m -g users -G wheel,audio,input,power,storage,video,sys,optical,adm,lp,scanner,sddm,kvm,fuse,autologin,network,wireshark,docker,libvirt,libvirtdbus -s /usr/bin/zsh --uid ${useruid} ${user}
+    useradd -m -g master -G users,wheel,audio,input,power,storage,video,sys,optical,adm,lp,scanner,sddm,kvm,fuse,autologin,network,wireshark,docker,libvirt,libvirtdbus -s /usr/bin/zsh --uid ${useruid} ${user}
     echo "${user}:${userpass}" | chpasswd
     mkdir -p /home/${user}/
     userrechte
@@ -255,7 +257,7 @@ pacmanconf
 if [ "$1" == "adduser" ]; then
     user="$2"
     userpass="$3"
-    if cat /etc/passwd | grep "x:1000" > /dev/null; then
+    if cat /etc/passwd | grep "x:2000" > /dev/null; then
         echo "${user} existiert bereits!!!"
     else
         addusers
diff --git a/arch-install.sh b/arch-install.sh
index f4d1fd9..41b59ec 100755
--- a/arch-install.sh
+++ b/arch-install.sh
@@ -11,8 +11,8 @@ repo1=shell-scripte-code
 cache=/var/cache/pacman/pkg/
 repo_url="https://git.spectreos.de/simono41/SpectreOS/raw/master/repo.sh"
 
-if cat /etc/passwd | grep "x:1000" > /dev/null; then
-    tempuser=$(cat /etc/passwd | grep "x:1000" | awk '{print $1}')
+if cat /etc/passwd | grep "x:2000" > /dev/null; then
+    tempuser=$(cat /etc/passwd | grep "x:2000" | awk '{print $1}')
     user=${tempuser%%:*}
 else
     user=$(whoami)
diff --git a/scripts/aurinstall.sh b/scripts/aurinstall.sh
index 90e9233..453724e 100755
--- a/scripts/aurinstall.sh
+++ b/scripts/aurinstall.sh
@@ -2,8 +2,8 @@
 
 set -x
 
-if cat /etc/passwd | grep "x:1000" > /dev/null; then
-    tempuser=$(cat /etc/passwd | grep "x:1000" | awk '{print $1}')
+if cat /etc/passwd | grep "x:2000" > /dev/null; then
+    tempuser=$(cat /etc/passwd | grep "x:2000" | awk '{print $1}')
     user=${tempuser%%:*}
 else
     user=$(whoami)
diff --git a/scripts/aurupdater.sh b/scripts/aurupdater.sh
index f2a2f4f..6f44fd9 100755
--- a/scripts/aurupdater.sh
+++ b/scripts/aurupdater.sh
@@ -2,8 +2,8 @@
 
 set -x
 
-if cat /etc/passwd | grep "x:1000" > /dev/null; then
-    tempuser=$(cat /etc/passwd | grep "x:1000" | awk '{print $1}')
+if cat /etc/passwd | grep "x:2000" > /dev/null; then
+    tempuser=$(cat /etc/passwd | grep "x:2000" | awk '{print $1}')
     user=${tempuser%%:*}
 else
     user=$(whoami)
diff --git a/scripts/startup-script.sh b/scripts/startup-script.sh
index b17a9a6..319bb04 100755
--- a/scripts/startup-script.sh
+++ b/scripts/startup-script.sh
@@ -6,9 +6,11 @@ cmdlineparameter=$(cat /proc/cmdline)
 repo=SpectreOS
 user=user1
 
-if cat /etc/passwd | grep "x:1000" > /dev/null; then
-    tempuser=$(cat /etc/passwd | grep "x:1000" | awk '{print $1}')
+if cat /etc/passwd | grep "x:2000" > /dev/null; then
+    tempuser=$(cat /etc/passwd | grep "x:2000" | awk '{print $1}')
     user=${tempuser%%:*}
+#else
+#    user=$(whoami)
 fi
 
 for wort in $(cat /proc/cmdline)