From 76d3a0e4e27a18b747534a71ced83c5d053c6fb6 Mon Sep 17 00:00:00 2001
From: nicedevil007 <17103076+nicedevil007@users.noreply.github.com>
Date: Sat, 18 Mar 2023 07:48:59 +0100
Subject: [PATCH] Get rid of wget on Alpine Linux

Now we can curl everything, one package less on installation :)

Get rid of Midnight Commander package, I never used it in any LXC, I guess that is from debugging there right?
---
 ct/alpine-adguard-v5.sh              | 14 +++++++-------
 install/alpine-adguard-v5-install.sh | 16 +++++++---------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/ct/alpine-adguard-v5.sh b/ct/alpine-adguard-v5.sh
index 092bdd93..6afb4846 100644
--- a/ct/alpine-adguard-v5.sh
+++ b/ct/alpine-adguard-v5.sh
@@ -20,12 +20,12 @@ EOF
 header_info
 echo -e "Loading..."
 APP="Alpine-AdGuard"
-var_disk="0.5"
+var_disk="0.3"
 var_cpu="1"
 var_ram="256"
 var_os="alpine"
 var_version="3.17"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
+NSAPP=`echo "${APP}" | tr '[A-Z]' '[a-z]'`
 var_install="${NSAPP}-v5-install"
 timezone=$(cat /etc/timezone)
 INTEGER='^[0-9]+([.][0-9]+)?$'
@@ -357,10 +357,10 @@ msg_info "Stopping AdguardHome"
 /opt/AdGuardHome/AdGuardHome -s stop &>/dev/null
 msg_ok "Stopped AdguardHome"
 
-VER=$(curl --silent -qI https://github.com/AdguardTeam/AdGuardHome/releases/latest | awk -F '/' '/^location/ {print  substr($NF, 1, length($NF)-1)}');
+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"
-wget -qL "https://github.com/AdguardTeam/AdGuardHome/releases/download/$VER/AdGuardHome_linux_amd64.tar.gz"
-tar -xvf AdGuardHome_linux_amd64.tar.gz &>/dev/null
+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
 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_linux_amd64.tar.gz AdGuardHome adguard-backup
+rm -rf AdGuardHome.tar.gz AdGuardHome adguard-backup
 msg_ok "Cleaned"
 msg_ok "Update Successfull"
 exit
@@ -429,7 +429,7 @@ bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/c
 msg_info "Starting LXC Container"
 pct start $CTID
 msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- ash -c "$(wget -qO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
+lxc-attach -n $CTID -- ash -c "$(wget -qO - https://raw.githubusercontent.com/nicedevil007/Proxmox/alpine-adguard-LXC/install/$var_install.sh)" || exit
 IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
 pct set $CTID -description "# ${APP} LXC
 ### https://tteck.github.io/Proxmox/
diff --git a/install/alpine-adguard-v5-install.sh b/install/alpine-adguard-v5-install.sh
index 4c413c23..4ca7127f 100644
--- a/install/alpine-adguard-v5-install.sh
+++ b/install/alpine-adguard-v5-install.sh
@@ -97,20 +97,18 @@ $STD apk upgrade
 msg_ok "Updated Container OS"
 
 msg_info "Installing Dependencies"
-$STD apk add wget
-$STD apk add bash
-$STD apk add curl
-$STD apk add nano
-$STD apk add mc
-$STD apk add openssh
+$STD apk add --no-cache bash
+$STD apk add --no-cache curl
+$STD apk add --no-cache openssh
+$STD apk add --no-cache nano
 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 wget -qL "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 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 mv AdGuardHome /opt
-$STD rm AdGuardHome_linux_amd64.tar.gz
+$STD rm AdGuardHome.tar.gz
 $STD chmod +x /opt/AdGuardHome/AdGuardHome
 $STD /opt/AdGuardHome/AdGuardHome -s install
 $STD /opt/AdGuardHome/AdGuardHome -s start