From f993194eba3153ac808e2b2ac14bccf8d5a7a042 Mon Sep 17 00:00:00 2001
From: i-c-u-p <96894903+i-c-u-p@users.noreply.github.com>
Date: Thu, 28 Apr 2022 11:05:11 +0000
Subject: [PATCH] fix last commit, undo pointless sed changes in b07be8b

for some reason in b07be8b i made the sudoers sed exprs match less specific patterns and said i "fixed them". the actual problem was some had two s commands which i didn't fix until f0bcb96. also reverted locale.gen's sed to avoid uncommenting en_US.UTF-8 twice.
---
 scripts/1-setup.sh      | 2 +-
 scripts/3-post-setup.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/1-setup.sh b/scripts/1-setup.sh
index 6d05357..a37d8a4 100755
--- a/scripts/1-setup.sh
+++ b/scripts/1-setup.sh
@@ -46,7 +46,7 @@ echo "
 -------------------------------------------------------------------------
                     Setup Language to US and set locale
 -------------------------------------------------------------------------"
-sed -i '/en_US.UTF-8 UTF-8/s/^#//' /etc/locale.gen
+sed -i 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
 locale-gen
 timedatectl --no-ask-password set-timezone ${TIMEZONE}
 timedatectl --no-ask-password set-ntp 1
diff --git a/scripts/3-post-setup.sh b/scripts/3-post-setup.sh
index 491914e..4216e1a 100755
--- a/scripts/3-post-setup.sh
+++ b/scripts/3-post-setup.sh
@@ -144,11 +144,11 @@ echo "
                     Cleaning
 -------------------------------------------------------------------------"
 # Remove no password sudo rights
-sed -i 's/%wheel ALL=(ALL) NOPASSWD: ALL/# &/' /etc/sudoers
-sed -i 's/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/# &/' /etc/sudoers
+sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# &/' /etc/sudoers
+sed -i 's/^%wheel ALL=(ALL:ALL) NOPASSWD: ALL/# &/' /etc/sudoers
 # Add sudo rights
-sed -i 's/^#%wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
-sed -i 's/^#%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
+sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
+sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
 
 rm -r $HOME/ArchTitus /home/$USERNAME/ArchTitus