Merge 85eb661c08 into 8cb63aa07c

Update apt-cacher-ng.sh: Typo (#1545 )
Rename update_json_date.yml to update_json_date.yml.bak
2025-01-31 04:50:14 +00:00 · 2025-01-17 22:48:48 +01:00 · 2025-01-17 19:43:48 +01:00 · 2025-01-17 16:04:30 +01:00 · 2025-01-11 12:04:25 +00:00 · 2025-01-07 19:03:40 +00:00
12 changed files with 26 additions and 52 deletions
--- a/.github/workflows/update_json_date.yml.bak
+++ b/.github/workflows/update_json_date.yml.bak
--- a/ct/apt-cacher-ng.sh
+++ b/ct/apt-cacher-ng.sh
@ -46,4 +46,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3142/acng-report.html{CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3142/acng-report.html${CL}"
--- 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
+install_core_packages

 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
 $STD apk add tzdata
-$STD apk add nano
-$STD apk add mc
 msg_ok "Installed Dependencies"

 msg_info "Installing Docker"
--- a/install/alpine-grafana-install.sh
+++ b/install/alpine-grafana-install.sh
@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
-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"
+install_core_packages

 msg_info "Installing Grafana"
 $STD apk add grafana
--- a/install/alpine-install.sh
+++ b/install/alpine-install.sh
@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
-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"
+install_core_packages

 motd_ssh
 customize
--- a/install/alpine-nextcloud-install.sh
+++ b/install/alpine-nextcloud-install.sh
@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_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
 $STD apk add nginx
 msg_ok "Installed Dependencies"

--- 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
+install_core_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
 $STD apk add argon2
 msg_ok "Installed Dependencies"

--- a/install/alpine-zigbee2mqtt-install.sh
+++ b/install/alpine-zigbee2mqtt-install.sh
@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
-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"
+install_core_packages

 msg_info "Installing Alpine-Zigbee2MQTT"
 $STD apk add zigbee2mqtt
--- a/install/debian-install.sh
+++ b/install/debian-install.sh
@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
+install_core_packages

 motd_ssh
 customize
--- a/install/ubuntu-install.sh
+++ b/install/ubuntu-install.sh
@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
+install_core_packages

 motd_ssh
 customize
--- a/misc/alpine-install.func
+++ b/misc/alpine-install.func
@ -133,6 +133,14 @@ update_os() {
  msg_ok "Updated Container 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_packages() {
+  msg_info "Installing Core Packages"
+  apk add -q curl mc nano newt openssh sudo &>/dev/null
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
  # Set terminal to 256-color mode
--- a/misc/install.func
+++ b/misc/install.func
@ -197,6 +197,15 @@ EOF
  msg_ok "Updated Container OS"
 }

+# 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.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  apt-get install -y curl mc sudo &> /dev/null
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
  # Set terminal to 256-color mode
Author	SHA1	Message	Date
Duncan Hill	4398156b87	Merge `85eb661c08` into `8cb63aa07c`	2025-01-17 22:48:48 +01:00
Michel Roegl-Brunner	8cb63aa07c	Update apt-cacher-ng.sh: Typo (#1545 ) Some checks are pending Auto Update .app-headers / update-app-headers (push) Waiting to run Details Shellcheck / Shellcheck (push) Waiting to run Details Create Changelog Pull Request / update-changelog-pull-request (push) Waiting to run Details	2025-01-17 19:43:48 +01:00
CanbiZ	ce7bb6612d	Rename update_json_date.yml to update_json_date.yml.bak	2025-01-17 16:04:30 +01:00
Duncan Hill	85eb661c08	Remove $STD, add quiet/yes, add squelch via dev/null	2025-01-11 12:04:25 +00:00
Duncan Hill	d242578c35	Fix duplication in comment, rename to install_core_packages	2025-01-07 19:03:40 +00:00
Duncan Hill	67ddcd6ebb	Update to title case to match other info/ok strings	2025-01-07 18:52:32 +00:00
Duncan Hill	1789b71734	Make core dependencies a function, update sample installers to use it	2025-01-07 18:31:14 +00:00