community-scripts/ProxmoxVE
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-03-03 16:15:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: whitespace cleanup and indentation fix in tools.func

Browse Source
This commit is contained in:
MickLesk
2026-03-01 20:22:57 +01:00
parent 31c7a86a4d
commit 82eac757d6
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
misc/tools.func
View File

@@ -1418,36 +1418,36 @@ get_parallel_jobs() {
if [[ -z "${_PARALLEL_JOBS:-}" ]]; then if [[ -z "${_PARALLEL_JOBS:-}" ]]; then
local cpu_count local cpu_count
cpu_count=$(nproc 2>/dev/null || grep -c ^processor /proc/cpuinfo 2>/dev/null || echo 1) cpu_count=$(nproc 2>/dev/null || grep -c ^processor /proc/cpuinfo 2>/dev/null || echo 1)
local mem_mb local mem_mb
mem_mb=$(free -m 2>/dev/null | awk '/^Mem:/{print $2}' || echo 1024) mem_mb=$(free -m 2>/dev/null | awk '/^Mem:/{print $2}' || echo 1024)
# Assume 1.5GB per compilation job for safety margin # Assume 1.5GB per compilation job for safety margin
local max_by_mem=$((mem_mb / 1536)) local max_by_mem=$((mem_mb / 1536))
((max_by_mem < 1)) && max_by_mem=1 ((max_by_mem < 1)) && max_by_mem=1
# Check current system load - reduce jobs if already loaded # Check current system load - reduce jobs if already loaded
local load_1m local load_1m
load_1m=$(awk '{print int($1)}' /proc/loadavg 2>/dev/null || echo 0) load_1m=$(awk '{print int($1)}' /proc/loadavg 2>/dev/null || echo 0)
local available_cpus=$((cpu_count - load_1m)) local available_cpus=$((cpu_count - load_1m))
((available_cpus < 1)) && available_cpus=1 ((available_cpus < 1)) && available_cpus=1
# Take minimum of: available CPUs, memory-limited, and total CPUs # Take minimum of: available CPUs, memory-limited, and total CPUs
local max_jobs=$cpu_count local max_jobs=$cpu_count
((max_by_mem < max_jobs)) && max_jobs=$max_by_mem ((max_by_mem < max_jobs)) && max_jobs=$max_by_mem
((available_cpus < max_jobs)) && max_jobs=$available_cpus ((available_cpus < max_jobs)) && max_jobs=$available_cpus
# Container detection - be more conservative in containers # Container detection - be more conservative in containers
if [[ -f /.dockerenv ]] || grep -q 'lxc\|docker\|container' /proc/1/cgroup 2>/dev/null; then if [[ -f /.dockerenv ]] || grep -q 'lxc\|docker\|container' /proc/1/cgroup 2>/dev/null; then
# Reduce by 25% in containers to leave headroom # Reduce by 25% in containers to leave headroom
max_jobs=$((max_jobs * 3 / 4)) max_jobs=$((max_jobs * 3 / 4))
((max_jobs < 1)) && max_jobs=1 ((max_jobs < 1)) && max_jobs=1
fi fi
# Final bounds check # Final bounds check
((max_jobs < 1)) && max_jobs=1 ((max_jobs < 1)) && max_jobs=1
((max_jobs > cpu_count)) && max_jobs=$cpu_count ((max_jobs > cpu_count)) && max_jobs=$cpu_count
export _PARALLEL_JOBS=$max_jobs export _PARALLEL_JOBS=$max_jobs
debug_log "Parallel jobs: $_PARALLEL_JOBS (CPUs: $cpu_count, mem-limit: $max_by_mem, load: $load_1m)" debug_log "Parallel jobs: $_PARALLEL_JOBS (CPUs: $cpu_count, mem-limit: $max_by_mem, load: $load_1m)"
fi fi
@@ -1723,11 +1723,11 @@ setup_deb822_repo() {
msg_error "Failed to download GPG key for ${name}" msg_error "Failed to download GPG key for ${name}"
rm -f "$tmp_gpg" rm -f "$tmp_gpg"
return 1 return 1
} }
if grep -q "BEGIN PGP" "$tmp_gpg" 2>/dev/null; then if grep -q "BEGIN PGP" "$tmp_gpg" 2>/dev/null; then
# ASCII-armored — dearmor to binary # ASCII-armored — dearmor to binary
gpg --dearmor --yes -o "/etc/apt/keyrings/${name}.gpg" <"$tmp_gpg" || { gpg --dearmor --yes -o "/etc/apt/keyrings/${name}.gpg" <"$tmp_gpg" || {
msg_error "Failed to install GPG key for ${name}" msg_error "Failed to install GPG key for ${name}"
rm -f "$tmp_gpg" rm -f "$tmp_gpg"
return 1 return 1