From 2f824100830be4d6f3e76aae98279a235381c3bb Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Mon, 13 Nov 2023 13:07:18 -0500
Subject: [PATCH] Update blocky-install.sh

code refactoring
---
 install/blocky-install.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/install/blocky-install.sh b/install/blocky-install.sh
index 6ef5abcc..f7e23b98 100644
--- a/install/blocky-install.sh
+++ b/install/blocky-install.sh
@@ -20,13 +20,13 @@ $STD apt-get install -y mc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Blocky"
-systemctl stop systemd-resolved
-$STD systemctl disable systemd-resolved.service
-RELEASE=0.20 #$(curl -s https://api.github.com/repos/0xERR0R/blocky/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-wget -q https://github.com/0xERR0R/blocky/releases/download/v$RELEASE/blocky_${RELEASE}_Linux_x86_64.tar.gz
-mkdir -p /opt/blocky
-tar -xf blocky_${RELEASE}_Linux_x86_64.tar.gz -C /opt/blocky
-rm -rf blocky_${RELEASE}_Linux_x86_64.tar.gz
+if systemctl is-active systemd-resolved > /dev/null 2>&1; then
+  systemctl disable -q --now systemd-resolved
+fi
+mkdir /opt/blocky
+RELEASE=$(curl -s https://api.github.com/repos/0xERR0R/blocky/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+wget -qO- https://github.com/0xERR0R/blocky/releases/download/v${RELEASE}/blocky_v${RELEASE}_Linux_x86_64.tar.gz | tar -xzf - -C /opt/blocky/
+
 cat <<EOF >/opt/blocky/config.yml
 upstream:
   # these external DNS resolvers will be used. Blocky picks 2 random resolvers from the list for each query