mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2026-08-03 14:26:24 +00:00
update 1.2.2.2 beta
This commit is contained in:
@@ -104,6 +104,11 @@ EOF
|
|||||||
if [[ "$need_update" == true ]] || [[ ! -d /var/lib/apt/lists || -z "$(ls -A /var/lib/apt/lists 2>/dev/null)" ]]; then
|
if [[ "$need_update" == true ]] || [[ ! -d /var/lib/apt/lists || -z "$(ls -A /var/lib/apt/lists 2>/dev/null)" ]]; then
|
||||||
msg_info "$(translate "Updating APT package lists...")"
|
msg_info "$(translate "Updating APT package lists...")"
|
||||||
apt-get update >/dev/null 2>&1 || apt-get update
|
apt-get update >/dev/null 2>&1 || apt-get update
|
||||||
|
# Spinner pair: msg_info must be closed before returning.
|
||||||
|
# Without this the next `msg_info` caller spawns a second
|
||||||
|
# spinner on top of ours and the original line never gets
|
||||||
|
# ✓'d — leaving a dangling progress char on screen.
|
||||||
|
msg_ok "$(translate "APT package lists updated")"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
@@ -436,15 +436,13 @@ offer_lxc_updates_if_any() {
|
|||||||
# System preparation (repos, headers, etc.)
|
# System preparation (repos, headers, etc.)
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
ensure_repos_and_headers() {
|
ensure_repos_and_headers() {
|
||||||
msg_info "$(translate 'Checking kernel headers and build tools...')"
|
# Bootstrap APT repos FIRST. On a fresh Proxmox install the
|
||||||
|
# pve-no-subscription / debian repos aren't configured by default
|
||||||
# On a fresh Proxmox install the pve-no-subscription / debian
|
# → `pve-headers-$(uname -r)` and `build-essential` come back as
|
||||||
# repos aren't configured by default, so `pve-headers-$(uname -r)`
|
# "Unable to locate package" and the NVIDIA install bails out with
|
||||||
# and even `build-essential` come back as "Unable to locate
|
# "no cc found". We delegate to the shared helper (same one the
|
||||||
# package" and the NVIDIA install bails out with "no cc found".
|
# post-install flow uses), which owns its own spinner pair — that's
|
||||||
# Bootstrap the repos through the shared helper (same one the
|
# why this block has to run BEFORE we open our own msg_info.
|
||||||
# post-install flow uses); fall back to sourcing the install
|
|
||||||
# utilities file if the function isn't already in scope.
|
|
||||||
if ! declare -F ensure_repositories >/dev/null 2>&1; then
|
if ! declare -F ensure_repositories >/dev/null 2>&1; then
|
||||||
local _utils_install="$LOCAL_SCRIPTS/global/utils-install-functions.sh"
|
local _utils_install="$LOCAL_SCRIPTS/global/utils-install-functions.sh"
|
||||||
[[ ! -f "$_utils_install" ]] && _utils_install="/usr/local/share/proxmenux/scripts/global/utils-install-functions.sh"
|
[[ ! -f "$_utils_install" ]] && _utils_install="/usr/local/share/proxmenux/scripts/global/utils-install-functions.sh"
|
||||||
@@ -455,6 +453,9 @@ ensure_repos_and_headers() {
|
|||||||
ensure_repositories >>"$LOG_FILE" 2>&1 || true
|
ensure_repositories >>"$LOG_FILE" 2>&1 || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Now own the spinner for the headers + build-tools check.
|
||||||
|
msg_info "$(translate 'Checking kernel headers and build tools...')"
|
||||||
|
|
||||||
local kver
|
local kver
|
||||||
kver=$(uname -r)
|
kver=$(uname -r)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user