From a35a75eadbf1e44ba8bc3feb9c09e6c5c67488d9 Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Sun, 23 Aug 2026 03:21:42 +0200
Subject: [PATCH] Set default ProxmoxVE raw URL in PVE-UPS & fix var_cpu
 sorting  (#16689)

* Set default ProxmoxVE raw URL in UPS script

Define `_CS_DEFAULT_URL` at the top of `ct/pve-ups.sh` and remove the outdated bootstrap comments, aligning the script with the newer URL-default pattern used for script sourcing.

* Branch var_cpu by OS where the two variants actually differ

The merged scripts branch var_ram, var_disk and var_version on var_os but
left var_cpu above the branch, so both variants inherited the Debian value.
On Vaultwarden that meant an Alpine container was told it wanted four cores
for an update that runs apk and restarts a service.

Only seven scripts are affected. Comparing each merged script against the
alpine-* script it replaced, 22 of the 29 already had the same CPU count on
both sides, so moving the line there would be churn with no behaviour change.
These seven did not:

  docker, forgejo, ironclaw, syncthing, transmission, zigbee2mqtt   2 -> 1
  vaultwarden                                                       4 -> 1

The Alpine values are the ones those scripts carried before the merge, read
back out of the deleted alpine-* files rather than picked. The Debian arm
keeps what it has now.

Needs the matching core change: until build.func derives var_os inside a
container, an update never reaches the Alpine arm at all.

* fix: source url

* Update script to source build functions from URLs

---------

Co-authored-by: Tobias <96661824+CrazyWolf13@users.noreply.github.com>
---
 ct/docker.sh       | 3 ++-
 ct/forgejo.sh      | 3 ++-
 ct/ironclaw.sh     | 3 ++-
 ct/pve-ups.sh      | 4 +---
 ct/syncthing.sh    | 3 ++-
 ct/transmission.sh | 3 ++-
 ct/vaultwarden.sh  | 3 ++-
 ct/zigbee2mqtt.sh  | 3 ++-
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ct/docker.sh b/ct/docker.sh
index d1cd3ba78..8611ceb7a 100644
--- a/ct/docker.sh
+++ b/ct/docker.sh
@@ -9,7 +9,6 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 
 APP="Docker"
 var_tags="${var_tags:-docker}"
-var_cpu="${var_cpu:-2}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"
 if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
@@ -19,10 +18,12 @@ if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
 fi
 
 if [[ "${var_os:-}" == "alpine" ]]; then
+  var_cpu="${var_cpu:-1}"
   var_ram="${var_ram:-1024}"
   var_disk="${var_disk:-2}"
   var_version="${var_version:-3.24}"
 else
+  var_cpu="${var_cpu:-2}"
   var_ram="${var_ram:-2048}"
   var_disk="${var_disk:-4}"
   var_version="${var_version:-13}"
diff --git a/ct/forgejo.sh b/ct/forgejo.sh
index 12b4325c0..c26d413b2 100644
--- a/ct/forgejo.sh
+++ b/ct/forgejo.sh
@@ -9,7 +9,6 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 
 APP="Forgejo"
 var_tags="${var_tags:-git}"
-var_cpu="${var_cpu:-2}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"
 if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
@@ -19,10 +18,12 @@ if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
 fi
 
 if [[ "${var_os:-}" == "alpine" ]]; then
+  var_cpu="${var_cpu:-1}"
   var_ram="${var_ram:-256}"
   var_disk="${var_disk:-1}"
   var_version="${var_version:-3.24}"
 else
+  var_cpu="${var_cpu:-2}"
   var_ram="${var_ram:-2048}"
   var_disk="${var_disk:-10}"
   var_version="${var_version:-13}"
diff --git a/ct/ironclaw.sh b/ct/ironclaw.sh
index 4362a2621..1d34c6d66 100644
--- a/ct/ironclaw.sh
+++ b/ct/ironclaw.sh
@@ -9,7 +9,6 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 
 APP="IronClaw"
 var_tags="${var_tags:-ai;agent;security}"
-var_cpu="${var_cpu:-2}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"
 if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
@@ -19,10 +18,12 @@ if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
 fi
 
 if [[ "${var_os:-}" == "alpine" ]]; then
+  var_cpu="${var_cpu:-1}"
   var_ram="${var_ram:-1024}"
   var_disk="${var_disk:-8}"
   var_version="${var_version:-3.24}"
 else
+  var_cpu="${var_cpu:-2}"
   var_ram="${var_ram:-2048}"
   var_disk="${var_disk:-8}"
   var_version="${var_version:-13}"
diff --git a/ct/pve-ups.sh b/ct/pve-ups.sh
index 1187567bd..4b75633c3 100644
--- a/ct/pve-ups.sh
+++ b/ct/pve-ups.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
-# Engine comes from community-scripts/core; this repo only ships the scripts.
-# A local core checkout wins (COMMUNITY_SCRIPTS_CORE_DIR, else a sibling ../core),
-# so a fork or branch of core can be tested without editing this file.
+_CS_DEFAULT_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main"
 _cs_boot="${COMMUNITY_SCRIPTS_CORE_DIR:-$(dirname "${BASH_SOURCE[0]}")/../../core}/core/build.func"
 source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/build.func")
 # Copyright (c) 2021-2026 community-scripts ORG
diff --git a/ct/syncthing.sh b/ct/syncthing.sh
index d47850341..ba3e2aec1 100644
--- a/ct/syncthing.sh
+++ b/ct/syncthing.sh
@@ -9,7 +9,6 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 
 APP="Syncthing"
 var_tags="${var_tags:-sync}"
-var_cpu="${var_cpu:-2}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"
 if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
@@ -19,10 +18,12 @@ if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
 fi
 
 if [[ "${var_os:-}" == "alpine" ]]; then
+  var_cpu="${var_cpu:-1}"
   var_ram="${var_ram:-256}"
   var_disk="${var_disk:-1}"
   var_version="${var_version:-3.24}"
 else
+  var_cpu="${var_cpu:-2}"
   var_ram="${var_ram:-2048}"
   var_disk="${var_disk:-8}"
   var_version="${var_version:-13}"
diff --git a/ct/transmission.sh b/ct/transmission.sh
index ee86f8194..584a2c72d 100644
--- a/ct/transmission.sh
+++ b/ct/transmission.sh
@@ -9,7 +9,6 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 
 APP="Transmission"
 var_tags="${var_tags:-torrent}"
-var_cpu="${var_cpu:-2}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"
 if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
@@ -19,10 +18,12 @@ if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
 fi
 
 if [[ "${var_os:-}" == "alpine" ]]; then
+  var_cpu="${var_cpu:-1}"
   var_ram="${var_ram:-256}"
   var_disk="${var_disk:-1}"
   var_version="${var_version:-3.24}"
 else
+  var_cpu="${var_cpu:-2}"
   var_ram="${var_ram:-2048}"
   var_disk="${var_disk:-8}"
   var_version="${var_version:-13}"
diff --git a/ct/vaultwarden.sh b/ct/vaultwarden.sh
index 5ac6f3855..2c1f9e787 100644
--- a/ct/vaultwarden.sh
+++ b/ct/vaultwarden.sh
@@ -9,7 +9,6 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 
 APP="Vaultwarden"
 var_tags="${var_tags:-password-manager}"
-var_cpu="${var_cpu:-4}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"
 if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
@@ -19,10 +18,12 @@ if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
 fi
 
 if [[ "${var_os:-}" == "alpine" ]]; then
+  var_cpu="${var_cpu:-1}"
   var_ram="${var_ram:-256}"
   var_disk="${var_disk:-1}"
   var_version="${var_version:-3.24}"
 else
+  var_cpu="${var_cpu:-4}"
   var_ram="${var_ram:-6144}"
   var_disk="${var_disk:-20}"
   var_version="${var_version:-13}"
diff --git a/ct/zigbee2mqtt.sh b/ct/zigbee2mqtt.sh
index 0d3cba5b9..ae2e0d022 100644
--- a/ct/zigbee2mqtt.sh
+++ b/ct/zigbee2mqtt.sh
@@ -9,7 +9,6 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 
 APP="Zigbee2MQTT"
 var_tags="${var_tags:-smarthome;zigbee;mqtt}"
-var_cpu="${var_cpu:-2}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-0}"
 if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
@@ -19,10 +18,12 @@ if [[ -z "${var_os:-}" ]] && command -v pveversion >/dev/null 2>&1; then
 fi
 
 if [[ "${var_os:-}" == "alpine" ]]; then
+  var_cpu="${var_cpu:-1}"
   var_ram="${var_ram:-256}"
   var_disk="${var_disk:-1}"
   var_version="${var_version:-3.24}"
 else
+  var_cpu="${var_cpu:-2}"
   var_ram="${var_ram:-1024}"
   var_disk="${var_disk:-5}"
   var_version="${var_version:-13}"