From 832a28319787ace9ec7037197772f374f522183a Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 12 Mar 2021 15:02:43 +0100
Subject: [PATCH] fix sudo users

---
 modules/30-users/post | 8 ++++++--
 modules/30-users/pre  | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/30-users/post b/modules/30-users/post
index 6a95355..53fce0b 100644
--- a/modules/30-users/post
+++ b/modules/30-users/post
@@ -5,9 +5,13 @@ source "${var}"
 for i in $(seq 1 "${users[amount]}"); do
         if ! cut -d: -f1 /etc/passwd | grep -q -w "${users[name$i]}"; then
                 useradd -G audio,video,floppy,cdrom,optical,input,users "${users[desc$i]}" -m -s "${users[shell$i]}" -U "${users[name$i]}"
-		if [[ ! -z "${users[sudo$i]}" ]]; then
-			usermod -a -G socklog,wheel,lpadmin "${i}"
+		if [[ "${users[sudo$i]}" == "1" ]]; then
+			usermod -a -G socklog,wheel,lpadmin "${users[name[$i]}"
 		fi
+                if [[ "${users[sudo$i]}" == "1" ]] && [[ ! "${cfg[de]}" == "none" ]]; then
+                        usermod -a -G lpadmin "${users[$i]}"
+                fi
+
                 echo password for "${users[name$i]}"
                 echo -e "${users[pw$i]}\n${users[pw$i]}" | passwd "${users[name$i]}"
         else
diff --git a/modules/30-users/pre b/modules/30-users/pre
index 03eecae..e8f70d5 100644
--- a/modules/30-users/pre
+++ b/modules/30-users/pre
@@ -51,9 +51,9 @@ while echo $((index++)) > /dev/null; do
 
 		if [[ "${repeat}" == "1" ]] || [[ "${standalone}" == "1" ]]; then
 			if yesno "sudo?" n; then
-				useradder "sudo" "${counter}" ",wheel,socklog"
+				useradder "sudo" "${counter}" "1"
 			else
-				useradder "sudo" "${counter}" ""
+				useradder "sudo" "${counter}" "1"
 			fi
 		elif [[ ! "${repeat}" == "1" ]]; then
 			useradder "sudo" "${counter}" ",wheel,socklog"
@@ -82,4 +82,4 @@ while echo $((index++)) > /dev/null; do
 done
 useradder "am" "ount" "${counter}"
 
-module end
\ No newline at end of file
+module end