From 4dbb2ce9064342e34c05e9f6fae027156dcc1f4f Mon Sep 17 00:00:00 2001
From: nicedevil007 <17103076+nicedevil007@users.noreply.github.com>
Date: Sat, 18 Mar 2023 09:50:38 +0100
Subject: [PATCH] reverted back to wget as tteck recommends

---
 ct/alpine-adguard-v5.sh              |  8 ++++----
 install/alpine-adguard-v5-install.sh | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ct/alpine-adguard-v5.sh b/ct/alpine-adguard-v5.sh
index 6afb4846..66e1964e 100644
--- a/ct/alpine-adguard-v5.sh
+++ b/ct/alpine-adguard-v5.sh
@@ -25,7 +25,7 @@ var_cpu="1"
 var_ram="256"
 var_os="alpine"
 var_version="3.17"
-NSAPP=`echo "${APP}" | tr '[A-Z]' '[a-z]'`
+NSAPP=$(echo ${APP,,} | tr -d ' ')
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
 INTEGER='^[0-9]+([.][0-9]+)?$'
@@ -359,8 +359,8 @@ msg_ok "Stopped AdguardHome"
 
 VER=$(curl -sqI https://github.com/AdguardTeam/AdGuardHome/releases/latest | awk -F '/' '/^location/ {print  substr($NF, 1, length($NF)-1)}');
 msg_info "Updating AdguardHome to $VER"
-curl -sL "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz" > AdGuardHome.tar.gz
-tar -xvf AdGuardHome.tar.gz &>/dev/null
+wget -q "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz"
+tar -xvf AdGuardHome_linux_amd64.tar.gz &>/dev/null
 mkdir -p adguard-backup
 cp -r /opt/AdGuardHome/AdGuardHome.yaml /opt/AdGuardHome/data adguard-backup/
 cp AdGuardHome/AdGuardHome /opt/AdGuardHome/AdGuardHome
@@ -372,7 +372,7 @@ msg_info "Starting AdguardHome"
 msg_ok "Started AdguardHome"
 
 msg_info "Cleaning Up"
-rm -rf AdGuardHome.tar.gz AdGuardHome adguard-backup
+rm -rf AdGuardHome_linux_amd64.tar.gz AdGuardHome adguard-backup
 msg_ok "Cleaned"
 msg_ok "Update Successfull"
 exit
diff --git a/install/alpine-adguard-v5-install.sh b/install/alpine-adguard-v5-install.sh
index 4ca7127f..0e858b7c 100644
--- a/install/alpine-adguard-v5-install.sh
+++ b/install/alpine-adguard-v5-install.sh
@@ -97,18 +97,20 @@ $STD apk upgrade
 msg_ok "Updated Container OS"
 
 msg_info "Installing Dependencies"
-$STD apk add --no-cache bash
-$STD apk add --no-cache curl
-$STD apk add --no-cache openssh
-$STD apk add --no-cache nano
+$STD apk add wget
+$STD apk add bash
+$STD apk add curl
+$STD apk add nano
+$STD apk add mc
+$STD apk add openssh
 msg_ok "Installed Dependencies"
 
 msg_info "Installing AdguardHome"
 VER=$(curl --silent -qI https://github.com/AdguardTeam/AdGuardHome/releases/latest | awk -F '/' '/^location/ {print  substr($NF, 1, length($NF)-1)}');
-$STD curl -sL "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz" > AdGuardHome.tar.gz
-$STD tar -xvf AdGuardHome.tar.gz >/dev/null 2>&1
+$STD wget -q "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz"
+$STD tar -xvf AdGuardHome_linux_amd64.tar.gz >/dev/null 2>&1
 $STD mv AdGuardHome /opt
-$STD rm AdGuardHome.tar.gz
+$STD rm AdGuardHome_linux_amd64.tar.gz
 $STD chmod +x /opt/AdGuardHome/AdGuardHome
 $STD /opt/AdGuardHome/AdGuardHome -s install
 $STD /opt/AdGuardHome/AdGuardHome -s start