From d242578c3526a93d0b7b5d28a1a3bbb947ff4fe6 Mon Sep 17 00:00:00 2001
From: Duncan Hill <github.commits@cricalix.net>
Date: Tue, 7 Jan 2025 19:03:40 +0000
Subject: [PATCH] Fix duplication in comment, rename to install_core_packages

---
 install/alpine-docker-install.sh      | 2 +-
 install/alpine-grafana-install.sh     | 2 +-
 install/alpine-install.sh             | 2 +-
 install/alpine-nextcloud-install.sh   | 2 +-
 install/alpine-vaultwarden-install.sh | 2 +-
 install/alpine-zigbee2mqtt-install.sh | 2 +-
 install/debian-install.sh             | 2 +-
 install/ubuntu-install.sh             | 2 +-
 misc/alpine-install.func              | 6 +++---
 misc/install.func                     | 7 +++----
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/install/alpine-docker-install.sh b/install/alpine-docker-install.sh
index 6962873b..24e03f91 100644
--- a/install/alpine-docker-install.sh
+++ b/install/alpine-docker-install.sh
@@ -12,7 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-install_core_dependencies
+install_core_packages
 
 msg_info "Installing Dependencies"
 $STD apk add tzdata
diff --git a/install/alpine-grafana-install.sh b/install/alpine-grafana-install.sh
index 1b2f409f..234661ac 100644
--- a/install/alpine-grafana-install.sh
+++ b/install/alpine-grafana-install.sh
@@ -12,7 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-install_core_dependencies
+install_core_packages
 
 msg_info "Installing Grafana"
 $STD apk add grafana
diff --git a/install/alpine-install.sh b/install/alpine-install.sh
index 199e1516..a9e71e1c 100644
--- a/install/alpine-install.sh
+++ b/install/alpine-install.sh
@@ -12,7 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-install_core_dependencies
+install_core_packages
 
 motd_ssh
 customize
diff --git a/install/alpine-nextcloud-install.sh b/install/alpine-nextcloud-install.sh
index da5224a9..53a66e4d 100644
--- a/install/alpine-nextcloud-install.sh
+++ b/install/alpine-nextcloud-install.sh
@@ -12,7 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-install_core_dependencies
+install_core_packages
 
 msg_info "Installing Dependencies"
 $STD apk add openssl
diff --git a/install/alpine-vaultwarden-install.sh b/install/alpine-vaultwarden-install.sh
index 49dd79eb..de0a1fa2 100644
--- a/install/alpine-vaultwarden-install.sh
+++ b/install/alpine-vaultwarden-install.sh
@@ -12,7 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-install_core_dependencies
+install_core_packages
 
 msg_info "Installing Dependencies"
 $STD apk add openssl
diff --git a/install/alpine-zigbee2mqtt-install.sh b/install/alpine-zigbee2mqtt-install.sh
index 2e3b3f8a..3c7eb7a0 100644
--- a/install/alpine-zigbee2mqtt-install.sh
+++ b/install/alpine-zigbee2mqtt-install.sh
@@ -12,7 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-install_core_dependencies
+install_core_packages
 
 msg_info "Installing Alpine-Zigbee2MQTT"
 $STD apk add zigbee2mqtt
diff --git a/install/debian-install.sh b/install/debian-install.sh
index bed8876c..af8be8c8 100644
--- a/install/debian-install.sh
+++ b/install/debian-install.sh
@@ -12,7 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-install_core_dependencies
+install_core_packages
 
 motd_ssh
 customize
diff --git a/install/ubuntu-install.sh b/install/ubuntu-install.sh
index 29ad16a4..45d2b372 100644
--- a/install/ubuntu-install.sh
+++ b/install/ubuntu-install.sh
@@ -12,7 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-install_core_dependencies
+install_core_packages
 
 motd_ssh
 customize
diff --git a/misc/alpine-install.func b/misc/alpine-install.func
index 6c2e2d82..8b3276b0 100644
--- a/misc/alpine-install.func
+++ b/misc/alpine-install.func
@@ -135,10 +135,10 @@ update_os() {
 
 # Install core packages that (almost) every container will depend upon.
 # Be sure to update install.func for apt-based systems as appropriate.
-install_core_dependencies() {
-  msg_info "Installing Core Dependencies"
+install_core_packages() {
+  msg_info "Installing Core Packages"
   $STD apk add curl mc nano newt openssh sudo
-  msg_ok "Installed Core Dependencies"
+  msg_ok "Installed Core Packages"
 }
 
 # This function modifies the message of the day (motd) and SSH settings
diff --git a/misc/install.func b/misc/install.func
index 54f63115..4331d229 100644
--- a/misc/install.func
+++ b/misc/install.func
@@ -200,11 +200,10 @@ EOF
 # Install core packages that (almost) every container will depend upon.
 # Be sure to update alpine-install.func to match for apk-based systems when
 # adding a new package.
-# a new package.
-install_core_dependencies() {
-  msg_info "Installing Core Dependencies"
+install_core_packages() {
+  msg_info "Installing Core Packages"
   $STD apt-get install curl mc sudo
-  msg_ok "Installed Core Dependencies"
+  msg_ok "Installed Core Packages"
 }
 
 # This function modifies the message of the day (motd) and SSH settings