From 44d02c5d19579c2632a63cf68ce9d6388b74447d Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Tue, 28 Nov 2023 01:10:05 +0000
Subject: [PATCH] Removed double sudo prompt

---
 scripts/provision.sh          | 10 ++++------
 scripts/src/provision.sh.tmpl | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/scripts/provision.sh b/scripts/provision.sh
index 1e46d220..a8799a2d 100644
--- a/scripts/provision.sh
+++ b/scripts/provision.sh
@@ -305,12 +305,10 @@ setupPasswordlessSudo() {
     logg info 'Press CTRL+C to bypass this prompt to either enter your password when needed or perform a non-privileged installation'
     logg info 'Note: Non-privileged installations are not yet supported'
   fi
-  if ! sudo cat /etc/sudoers | grep '# TEMPORARY FOR INSTALL DOCTOR' > /dev/null; then
-    if [ -n "$SUDO_PASSWORD" ]; then
-      printf '%s\n' "$SUDO_PASSWORD" | sudo -p "" -S echo "$(whoami) ALL=(ALL:ALL) NOPASSWD: ALL # TEMPORARY FOR INSTALL DOCTOR" | sudo tee -a /etc/sudoers
-    else
-      echo "$(whoami) ALL=(ALL:ALL) NOPASSWD: ALL # TEMPORARY FOR INSTALL DOCTOR" | sudo tee -a /etc/sudoers
-    fi
+  if [ -n "$SUDO_PASSWORD" ]; then
+    printf '%s\n' "$SUDO_PASSWORD" | sudo -p "" -S echo "$(whoami) ALL=(ALL:ALL) NOPASSWD: ALL # TEMPORARY FOR INSTALL DOCTOR" | sudo tee -a /etc/sudoers
+  else
+    echo "$(whoami) ALL=(ALL:ALL) NOPASSWD: ALL # TEMPORARY FOR INSTALL DOCTOR" | sudo tee -a /etc/sudoers
   fi
 }
 
diff --git a/scripts/src/provision.sh.tmpl b/scripts/src/provision.sh.tmpl
index e910130b..ec9b672c 100644
--- a/scripts/src/provision.sh.tmpl
+++ b/scripts/src/provision.sh.tmpl
@@ -113,12 +113,10 @@ setupPasswordlessSudo() {
     logg info 'Press CTRL+C to bypass this prompt to either enter your password when needed or perform a non-privileged installation'
     logg info 'Note: Non-privileged installations are not yet supported'
   fi
-  if ! sudo cat /etc/sudoers | grep '# TEMPORARY FOR INSTALL DOCTOR' > /dev/null; then
-    if [ -n "$SUDO_PASSWORD" ]; then
-      printf '%s\n' "$SUDO_PASSWORD" | sudo -p "" -S echo "$(whoami) ALL=(ALL:ALL) NOPASSWD: ALL # TEMPORARY FOR INSTALL DOCTOR" | sudo tee -a /etc/sudoers
-    else
-      echo "$(whoami) ALL=(ALL:ALL) NOPASSWD: ALL # TEMPORARY FOR INSTALL DOCTOR" | sudo tee -a /etc/sudoers
-    fi
+  if [ -n "$SUDO_PASSWORD" ]; then
+    printf '%s\n' "$SUDO_PASSWORD" | sudo -p "" -S echo "$(whoami) ALL=(ALL:ALL) NOPASSWD: ALL # TEMPORARY FOR INSTALL DOCTOR" | sudo tee -a /etc/sudoers
+  else
+    echo "$(whoami) ALL=(ALL:ALL) NOPASSWD: ALL # TEMPORARY FOR INSTALL DOCTOR" | sudo tee -a /etc/sudoers
   fi
 }