diff --git a/misc/alpine-install.func b/misc/alpine-install.func index f9059f9..6ee44f9 100644 --- a/misc/alpine-install.func +++ b/misc/alpine-install.func @@ -99,11 +99,6 @@ update_os() { $STD apk update $STD apk upgrade msg_ok "Updated Container OS" - - msg_info "Installing core dependencies" - $STD apk update - $STD apk add newt curl openssh nano mc ncurses - msg_ok "Core dependencies installed" } # This function modifies the message of the day (motd) and SSH settings diff --git a/misc/build.func b/misc/build.func index 3488c7b..17623a4 100644 --- a/misc/build.func +++ b/misc/build.func @@ -1265,7 +1265,7 @@ EOF http://dl-cdn.alpinelinux.org/alpine/latest-stable/main http://dl-cdn.alpinelinux.org/alpine/latest-stable/community EOF' - pct exec "$CTID" -- ash -c "apk add bash curl >/dev/null" + pct exec "$CTID" -- ash -c "apk add bash newt curl openssh nano mc ncurses >/dev/null" else # Set locale and timezone before update pct exec "$CTID" -- bash -c "sed -i '/$LANG/ s/^# //' /etc/locale.gen" @@ -1277,7 +1277,7 @@ EOF' pct exec "$CTID" -- bash -c "echo $tz >/etc/timezone && ln -sf /usr/share/zoneinfo/$tz /etc/localtime" # Install curl - pct exec "$CTID" -- bash -c "apt-get update >/dev/null && apt-get install -y curl >/dev/null" + pct exec "$CTID" -- bash -c "apt-get update >/dev/null && apt-get install -y sudo curl mc gpg2 >/dev/null" fi lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/install/"$var_install".sh)" $? diff --git a/misc/core.func b/misc/core.func index 06d023b..e0bc6de 100644 --- a/misc/core.func +++ b/misc/core.func @@ -90,6 +90,8 @@ default_vars() { # ------------------------------------------------------------------------------ # Sets default verbose mode for script execution. # ------------------------------------------------------------------------------ +VERBOSE="${1:-no}" +VERB=${var_verbose:-$VERBOSE} set_std_mode() { if [ "$VERB" = "yes" ]; then STD="" diff --git a/misc/install.func b/misc/install.func index a0894ab..eefe1f5 100644 --- a/misc/install.func +++ b/misc/install.func @@ -149,10 +149,6 @@ EOF rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Container OS" - msg_info "Installing core dependencies" - $STD apt-get update - $STD apt-get install -y sudo curl mc gnupg2 - msg_ok "Core dependencies installed" source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/tools.func) }