From 9912938106504e0e8892b6efa9658653742469ee Mon Sep 17 00:00:00 2001
From: nicedevil007 <17103076+nicedevil007@users.noreply.github.com>
Date: Sun, 26 Mar 2023 23:00:57 +0200
Subject: [PATCH] default Packages to simple func

now only the real required apps must be installed and listed under "installing dependencies" :)
---
 install/alpine-adguard-install.sh     | 10 +++-------
 install/alpine-docker-install.sh      | 10 +++-------
 install/alpine-esphome-install.sh     |  6 +-----
 install/alpine-grafana-install.sh     | 10 +++-------
 install/alpine-vaultwarden-install.sh |  6 +-----
 install/alpine-whoogle-install.sh     | 10 +++-------
 install/alpine-zigbee2mqtt-install.sh | 10 +++-------
 misc/alpine-install.func              | 10 ++++++++++
 8 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/install/alpine-adguard-install.sh b/install/alpine-adguard-install.sh
index 33df28ab..40202f94 100644
--- a/install/alpine-adguard-install.sh
+++ b/install/alpine-adguard-install.sh
@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+default_packages
 
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add nano
-$STD apk add mc
-$STD apk add openssh
-msg_ok "Installed Dependencies"
+#msg_info "Installing Dependencies"
+#msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-AdGuard"
 VER=$(curl --silent -qI https://github.com/AdguardTeam/AdGuardHome/releases/latest | awk -F '/' '/^location/ {print  substr($NF, 1, length($NF)-1)}');
diff --git a/install/alpine-docker-install.sh b/install/alpine-docker-install.sh
index 4ed450e5..cad62c60 100644
--- a/install/alpine-docker-install.sh
+++ b/install/alpine-docker-install.sh
@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+default_packages
 
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
+#msg_info "Installing Dependencies"
+#msg_ok "Installed Dependencies"
 
 msg_info "Installing Docker"
 $STD apk add docker
diff --git a/install/alpine-esphome-install.sh b/install/alpine-esphome-install.sh
index d9d84bde..e00df291 100644
--- a/install/alpine-esphome-install.sh
+++ b/install/alpine-esphome-install.sh
@@ -12,13 +12,9 @@ catch_errors
 setting_up_container
 network_check
 update_os
+default_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add git
 msg_ok "Installed Dependencies"
 
diff --git a/install/alpine-grafana-install.sh b/install/alpine-grafana-install.sh
index d20a7aca..89171e66 100644
--- a/install/alpine-grafana-install.sh
+++ b/install/alpine-grafana-install.sh
@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+default_packages
 
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
+#msg_info "Installing Dependencies"
+#msg_ok "Installed Dependencies"
 
 msg_info "Installing Grafana"
 $STD apk add grafana
diff --git a/install/alpine-vaultwarden-install.sh b/install/alpine-vaultwarden-install.sh
index 6c6f90a5..409ad09b 100644
--- a/install/alpine-vaultwarden-install.sh
+++ b/install/alpine-vaultwarden-install.sh
@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+default_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-Vaultwarden"
diff --git a/install/alpine-whoogle-install.sh b/install/alpine-whoogle-install.sh
index b85e76d0..50003c4b 100644
--- a/install/alpine-whoogle-install.sh
+++ b/install/alpine-whoogle-install.sh
@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+default_packages
 
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
+#msg_info "Installing Dependencies"
+#msg_ok "Installed Dependencies"
 
 msg_info "Installing pip3 Package Manager"
 $STD apk add py3-pip
diff --git a/install/alpine-zigbee2mqtt-install.sh b/install/alpine-zigbee2mqtt-install.sh
index 4abf334e..7487a4b5 100644
--- a/install/alpine-zigbee2mqtt-install.sh
+++ b/install/alpine-zigbee2mqtt-install.sh
@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+default_packages
 
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
+#msg_info "Installing Dependencies"
+#msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-Zigbee2MQTT"
 $STD apk add zigbee2mqtt
diff --git a/misc/alpine-install.func b/misc/alpine-install.func
index a7d282d9..98651c45 100644
--- a/misc/alpine-install.func
+++ b/misc/alpine-install.func
@@ -106,6 +106,16 @@ update_os() {
   msg_ok "Updated Container OS"
 }
 
+default_packages() {
+  msg_info "Installing Default Packages"
+  $STD apk add newt
+  $STD apk add curl
+  $STD apk add nano
+  $STD apk add mc
+  $STD apk add openssh
+  msg_ok "Installed Default Packages"
+}
+
 motd_ssh() {
   echo "export TERM='xterm-256color'" >>/root/.bashrc
   echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" >/etc/motd