From 7a2662cf1a6b49a505c147e86b817826a2e8adfa Mon Sep 17 00:00:00 2001
From: olli <olli@ds9.dedyn.io>
Date: Wed, 9 Aug 2023 16:42:11 +0200
Subject: [PATCH] mint.sh aktualisiert

---
 mint.sh | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/mint.sh b/mint.sh
index bb0a028..d8ecabb 100644
--- a/mint.sh
+++ b/mint.sh
@@ -15,6 +15,19 @@ Nutzung auf einene Gefahr!!! Nur mit Enter/Return fortfahren wenn dieses Skript
 
 whoami | grep -q ^root$ || read x
 
+# Check for using DoHoT
+if [ -e /etc/dnscrypt-proxy/blocked-names.txt ]
+then
+  if [ -s /etc/dontusedohot ]
+  then
+    if [ -e /etc/systemd/resolved.conf.d/DoHoT.conf ] 
+    then
+      sudo rm -f /etc/systemd/resolved.conf.d/DoHoT.conf 
+      sudo systemctl restart systemd-resolved.service
+    fi
+  fi
+fi
+
 # identify default user
 defaultuser=$(getent passwd 1000 | cut -d: -f1)
 defaultuserhome=$(getent passwd 1000 | cut -d: -f6)
@@ -103,25 +116,7 @@ do
   sudo rm -rf ${playbook}
 done
 
-sudo bash /usr/local/sbin/autoupdate.sh
-
-# Check for using DoHoT
-if [ -e /etc/dnscrypt-proxy/blocked-names.txt ]
-then
-  if [ -s /etc/dontusedohot ]
-  then
-    if [ -e /etc/systemd/resolved.conf.d/DoHoT.conf ] 
-    then
-      sudo rm -f /etc/systemd/resolved.conf.d/DoHoT.conf 
-      sudo systemctl restart systemd-resolved.service
-    fi
-  else
-    echo "[Resolve]
-DNS=127.0.2.1
-Domains=~." | sudo tee /etc/systemd/resolved.conf.d/DoHoT.conf
-    sudo systemctl restart systemd-resolved.service
-  fi
-fi
+sudo bash -x /usr/local/sbin/autoupdate.sh
 
 # Add User to docker group
 sudo usermod -aG docker ${defaultuser}