From 4e86b8487f4c13eb3ef384d29085c7e8e6a40451 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Fri, 19 Jun 2026 00:01:16 +1000 Subject: [PATCH] bump ram in alpine scripts + rename get_arch_value to arch_resolve bumped in bitmagnet gatus and grafana --- ct/alpine-bitmagnet.sh | 2 +- ct/alpine-garage.sh | 2 +- ct/alpine-gatus.sh | 2 +- ct/alpine-grafana.sh | 2 +- ct/alpine-rclone.sh | 2 +- ct/alpine-redlib.sh | 2 +- ct/alpine-rustdeskserver.sh | 4 ++-- ct/alpine-tinyauth.sh | 2 +- ct/alpine-wakapi.sh | 2 +- ct/anytype-server.sh | 2 +- ct/argus.sh | 2 +- ct/authentik.sh | 4 ++-- ct/autobrr.sh | 2 +- ct/backrest.sh | 2 +- ct/bichon.sh | 4 ++-- ct/birdnet-go.sh | 2 +- ct/blocky.sh | 2 +- ct/certimate.sh | 2 +- ct/cleanuparr.sh | 2 +- ct/cliproxyapi.sh | 2 +- ct/cloudreve.sh | 2 +- ct/dagu.sh | 2 +- ct/databasus.sh | 4 ++-- ct/ddns-updater.sh | 2 +- ct/discopanel.sh | 4 ++-- ct/donetick.sh | 2 +- ct/dynacat.sh | 2 +- ct/ebusd.sh | 2 +- ct/emqx.sh | 4 ++-- ct/ersatztv.sh | 4 ++-- ct/ezbookkeeping.sh | 2 +- ct/forgejo.sh | 2 +- install/adguard-install.sh | 2 +- install/agentdvr-install.sh | 6 +++--- install/alpine-adguard-install.sh | 8 ++++---- install/alpine-docker-install.sh | 2 +- install/alpine-garage-install.sh | 2 +- install/alpine-rclone-install.sh | 2 +- install/alpine-redlib-install.sh | 2 +- install/alpine-rustdeskserver-install.sh | 4 ++-- install/alpine-tinyauth-install.sh | 2 +- install/alpine-wakapi-install.sh | 2 +- install/anytype-server-install.sh | 2 +- install/apache-tomcat-install.sh | 2 +- install/argus-install.sh | 2 +- install/authentik-install.sh | 6 +++--- install/autobrr-install.sh | 2 +- install/autocaliweb-install.sh | 4 ++-- install/backrest-install.sh | 2 +- install/beszel-install.sh | 2 +- install/bichon-install.sh | 2 +- install/birdnet-go-install.sh | 2 +- install/bitfocus-companion-install.sh | 4 ++-- install/blocky-install.sh | 2 +- install/certimate-install.sh | 2 +- install/cleanuparr-install.sh | 2 +- install/cliproxyapi-install.sh | 2 +- install/cloudreve-install.sh | 2 +- install/cockpit-install.sh | 2 +- install/configarr-install.sh | 2 +- install/cosmos-install.sh | 2 +- install/crafty-controller-install.sh | 4 ++-- install/dagu-install.sh | 2 +- install/databasus-install.sh | 4 ++-- install/ddns-updater-install.sh | 2 +- install/deconz-install.sh | 4 ++-- install/discopanel-install.sh | 4 ++-- install/donetick-install.sh | 2 +- install/duplicati-install.sh | 2 +- install/dynacat-install.sh | 2 +- install/ebusd-install.sh | 2 +- install/emqx-install.sh | 4 ++-- install/erpnext-install.sh | 2 +- install/ersatztv-install.sh | 4 ++-- install/ezbookkeeping-install.sh | 2 +- install/fileflows-install.sh | 2 +- install/forgejo-install.sh | 2 +- install/frigate-install.sh | 4 ++-- misc/core.func | 6 +++--- 79 files changed, 105 insertions(+), 105 deletions(-) diff --git a/ct/alpine-bitmagnet.sh b/ct/alpine-bitmagnet.sh index f7bf50234..795ac2240 100644 --- a/ct/alpine-bitmagnet.sh +++ b/ct/alpine-bitmagnet.sh @@ -8,7 +8,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV APP="Alpine-bitmagnet" var_tags="${var_tags:-alpine;torrent}" var_cpu="${var_cpu:-2}" -var_ram="${var_ram:-$(get_arch_value 1024 2048)}" +var_ram="${var_ram:-2048}" var_disk="${var_disk:-3}" var_os="${var_os:-alpine}" var_version="${var_version:-3.23}" diff --git a/ct/alpine-garage.sh b/ct/alpine-garage.sh index d29c4d4f0..a132e9248 100644 --- a/ct/alpine-garage.sh +++ b/ct/alpine-garage.sh @@ -39,7 +39,7 @@ function update_script() { msg_ok "Backed Up Data" msg_info "Updating Garage" - curl -fsSL "https://garagehq.deuxfleurs.fr/_releases/${GITEA_RELEASE}/$(get_arch_value "x86_64" "aarch64")-unknown-linux-musl/garage" -o /usr/local/bin/garage + curl -fsSL "https://garagehq.deuxfleurs.fr/_releases/${GITEA_RELEASE}/$(arch_resolve "x86_64" "aarch64")-unknown-linux-musl/garage" -o /usr/local/bin/garage chmod +x /usr/local/bin/garage echo "${GITEA_RELEASE}" >~/.garage msg_ok "Updated Garage" diff --git a/ct/alpine-gatus.sh b/ct/alpine-gatus.sh index dc6f92168..9e331dce0 100644 --- a/ct/alpine-gatus.sh +++ b/ct/alpine-gatus.sh @@ -8,7 +8,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV APP="Alpine-gatus" var_tags="${var_tags:-alpine;monitoring}" var_cpu="${var_cpu:-1}" -var_ram="${var_ram:-$(get_arch_value 256 512)}" +var_ram="${var_ram:-512}" var_disk="${var_disk:-3}" var_os="${var_os:-alpine}" var_version="${var_version:-3.23}" diff --git a/ct/alpine-grafana.sh b/ct/alpine-grafana.sh index 50d1d959e..0f765e2f8 100644 --- a/ct/alpine-grafana.sh +++ b/ct/alpine-grafana.sh @@ -8,7 +8,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV APP="Alpine-Grafana" var_tags="${var_tags:-alpine;monitoring}" var_cpu="${var_cpu:-1}" -var_ram="${var_ram:-$(get_arch_value 256 512)}" +var_ram="${var_ram:-512}" var_disk="${var_disk:-2}" var_os="${var_os:-alpine}" var_version="${var_version:-3.23}" diff --git a/ct/alpine-rclone.sh b/ct/alpine-rclone.sh index f953a56e2..909d75dc5 100644 --- a/ct/alpine-rclone.sh +++ b/ct/alpine-rclone.sh @@ -31,7 +31,7 @@ function update_script() { if [ "${RELEASE}" != "$(cat /opt/rclone_version.txt)" ] || [ ! -f /opt/rclone_version.txt ]; then msg_info "Updating ${APP} LXC" temp_file=$(mktemp) - curl -fsSL "https://github.com/rclone/rclone/releases/download/v${RELEASE}/rclone-v${RELEASE}-linux-$(get_arch_value).zip" -o "$temp_file" + curl -fsSL "https://github.com/rclone/rclone/releases/download/v${RELEASE}/rclone-v${RELEASE}-linux-$(arch_resolve).zip" -o "$temp_file" $STD unzip -o "$temp_file" '*/**' -d /opt/rclone rm -f "$temp_file" echo "${RELEASE}" >/opt/rclone_version.txt diff --git a/ct/alpine-redlib.sh b/ct/alpine-redlib.sh index 5a27fe4af..0ee3d4f8b 100644 --- a/ct/alpine-redlib.sh +++ b/ct/alpine-redlib.sh @@ -36,7 +36,7 @@ function update_script() { $STD rc-service redlib stop msg_ok "Stopped Service" - fetch_and_deploy_gh_release "redlib" "redlib-org/redlib" "prebuild" "latest" "/opt/redlib" "redlib-$(get_arch_value "x86_64" "aarch64")-unknown-linux-musl.tar.gz" + fetch_and_deploy_gh_release "redlib" "redlib-org/redlib" "prebuild" "latest" "/opt/redlib" "redlib-$(arch_resolve "x86_64" "aarch64")-unknown-linux-musl.tar.gz" msg_info "Starting Service" $STD rc-service redlib start diff --git a/ct/alpine-rustdeskserver.sh b/ct/alpine-rustdeskserver.sh index 16ecc9825..ee83fac3f 100644 --- a/ct/alpine-rustdeskserver.sh +++ b/ct/alpine-rustdeskserver.sh @@ -35,7 +35,7 @@ function update_script() { $STD service rustdesk-server-hbbs stop $STD service rustdesk-server-hbbr stop temp_file1=$(mktemp) - ARCH=$(get_arch_value "amd64" "arm64v8") + ARCH=$(arch_resolve "amd64" "arm64v8") curl -fsSL "https://github.com/lejianwen/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-linux-${ARCH}.zip" -o "$temp_file1" $STD unzip "$temp_file1" cp -r "$ARCH"/* /opt/rustdesk-server/ @@ -52,7 +52,7 @@ function update_script() { msg_info "Updating RustDesk API to v${APIRELEASE}" $STD service rustdesk-api stop temp_file2=$(mktemp) - curl -fsSL "https://github.com/lejianwen/rustdesk-api/releases/download/v${APIRELEASE}/linux-$(get_arch_value).tar.gz" -o "$temp_file2" + curl -fsSL "https://github.com/lejianwen/rustdesk-api/releases/download/v${APIRELEASE}/linux-$(arch_resolve).tar.gz" -o "$temp_file2" $STD tar zxvf "$temp_file2" cp -r release/* /opt/rustdesk-api echo "${APIRELEASE}" >~/.rustdesk-api diff --git a/ct/alpine-tinyauth.sh b/ct/alpine-tinyauth.sh index 19afe2d0c..8df6f2104 100644 --- a/ct/alpine-tinyauth.sh +++ b/ct/alpine-tinyauth.sh @@ -52,7 +52,7 @@ function update_script() { msg_info "Updating Tinyauth" rm -f /opt/tinyauth/tinyauth - curl -fsSL "https://github.com/tinyauthapp/tinyauth/releases/download/v${RELEASE}/tinyauth-$(get_arch_value)" -o /opt/tinyauth/tinyauth + curl -fsSL "https://github.com/tinyauthapp/tinyauth/releases/download/v${RELEASE}/tinyauth-$(arch_resolve)" -o /opt/tinyauth/tinyauth chmod +x /opt/tinyauth/tinyauth echo "${RELEASE}" >~/.tinyauth msg_ok "Updated Tinyauth" diff --git a/ct/alpine-wakapi.sh b/ct/alpine-wakapi.sh index b5eb78e14..136a21c1e 100644 --- a/ct/alpine-wakapi.sh +++ b/ct/alpine-wakapi.sh @@ -43,7 +43,7 @@ function update_script() { cp /opt/wakapi/config.yml /opt/wakapi/wakapi_db.db /opt/wakapi-backup/ msg_ok "Created backup" - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "wakapi" "muety/wakapi" "prebuild" "latest" "/opt/wakapi" "wakapi_linux_$(get_arch_value).zip" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "wakapi" "muety/wakapi" "prebuild" "latest" "/opt/wakapi" "wakapi_linux_$(arch_resolve).zip" msg_info "Configuring Wakapi" cd /opt/wakapi diff --git a/ct/anytype-server.sh b/ct/anytype-server.sh index fdee48529..3147fc91f 100644 --- a/ct/anytype-server.sh +++ b/ct/anytype-server.sh @@ -38,7 +38,7 @@ function update_script() { create_backup /opt/anytype/data - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "anytype" "grishy/any-sync-bundle" "prebuild" "latest" "/opt/anytype" "any-sync-bundle_*_linux_$(get_arch_value).tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "anytype" "grishy/any-sync-bundle" "prebuild" "latest" "/opt/anytype" "any-sync-bundle_*_linux_$(arch_resolve).tar.gz" chmod +x /opt/anytype/any-sync-bundle restore_backup diff --git a/ct/argus.sh b/ct/argus.sh index 9b292c8e5..94141b56a 100644 --- a/ct/argus.sh +++ b/ct/argus.sh @@ -33,7 +33,7 @@ function update_script() { systemctl stop argus msg_ok "Service stopped" - fetch_and_deploy_gh_release "Argus" "release-argus/Argus" "singlefile" "latest" "/opt/argus" "Argus*linux-$(get_arch_value)" + fetch_and_deploy_gh_release "Argus" "release-argus/Argus" "singlefile" "latest" "/opt/argus" "Argus*linux-$(arch_resolve)" msg_info "Starting service" systemctl start argus diff --git a/ct/authentik.sh b/ct/authentik.sh index bbd7965c2..b857bcff4 100644 --- a/ct/authentik.sh +++ b/ct/authentik.sh @@ -33,7 +33,7 @@ function update_script() { read -r MAJOR MINOR PATCH <<< "$(sed 's/^version\///; s/\./ /g' "$HOME/.authentik")" msg_info "Update dependencies" - ensure_dependencies crossbuild-essential-$(get_arch_value) gcc-$(get_arch_value "x86-64" "aarch64")-linux-gnu cmake clang libunwind-18-dev + ensure_dependencies crossbuild-essential-$(arch_resolve) gcc-$(arch_resolve "x86-64" "aarch64")-linux-gnu cmake clang libunwind-18-dev msg_ok "Update dependencies" NODE_VERSION="24" setup_nodejs @@ -96,7 +96,7 @@ function update_script() { msg_info "Updating go proxy" cd /opt/authentik export CGO_ENABLED="1" - export CC="$(get_arch_value "x86_64" "aarch64")-linux-gnu-gcc" + export CC="$(arch_resolve "x86_64" "aarch64")-linux-gnu-gcc" $STD go mod download $STD go build -o /opt/authentik/authentik-server ./cmd/server $STD go build -o /opt/authentik/ldap ./cmd/ldap diff --git a/ct/autobrr.sh b/ct/autobrr.sh index 39edabe28..25b75798e 100644 --- a/ct/autobrr.sh +++ b/ct/autobrr.sh @@ -34,7 +34,7 @@ function update_script() { systemctl stop autobrr msg_ok "Stopped Service" - fetch_and_deploy_gh_release "autobrr" "autobrr/autobrr" "prebuild" "latest" "/usr/local/bin" "autobrr_*_linux_$(get_arch_value "x86_64" "arm64").tar.gz" + fetch_and_deploy_gh_release "autobrr" "autobrr/autobrr" "prebuild" "latest" "/usr/local/bin" "autobrr_*_linux_$(arch_resolve "x86_64" "arm64").tar.gz" msg_info "Starting Service" systemctl start autobrr diff --git a/ct/backrest.sh b/ct/backrest.sh index d85c8631c..519ca215d 100644 --- a/ct/backrest.sh +++ b/ct/backrest.sh @@ -34,7 +34,7 @@ function update_script() { systemctl stop backrest msg_ok "Stopped Service" - fetch_and_deploy_gh_release "backrest" "garethgeorge/backrest" "prebuild" "latest" "/opt/backrest/bin" "backrest_Linux_$(get_arch_value "x86_64" "arm64").tar.gz" + fetch_and_deploy_gh_release "backrest" "garethgeorge/backrest" "prebuild" "latest" "/opt/backrest/bin" "backrest_Linux_$(arch_resolve "x86_64" "arm64").tar.gz" msg_info "Starting Service" systemctl start backrest diff --git a/ct/bichon.sh b/ct/bichon.sh index 8bb8d2dc7..55888aa28 100644 --- a/ct/bichon.sh +++ b/ct/bichon.sh @@ -69,7 +69,7 @@ function update_script() { if [ "$MIGRATE_V1" -eq 1 ] && [ "$CURRENT_VERSION" != "0.3.7" ]; then msg_info "Updating to intermediate version v0.3.7" - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "bichon" "rustmailer/bichon" "prebuild" "v0.3.7" "/opt/bichon" "bichon-*-$(get_arch_value "x86_64" "aarch64")-unknown-linux-gnu.tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "bichon" "rustmailer/bichon" "prebuild" "v0.3.7" "/opt/bichon" "bichon-*-$(arch_resolve "x86_64" "aarch64")-unknown-linux-gnu.tar.gz" restore_backup systemctl start bichon sleep 30 @@ -77,7 +77,7 @@ function update_script() { msg_ok "Intermediate update completed" fi - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "bichon" "rustmailer/bichon" "prebuild" "latest" "/opt/bichon" "bichon-*-$(get_arch_value "x86_64" "aarch64")-unknown-linux-gnu.tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "bichon" "rustmailer/bichon" "prebuild" "latest" "/opt/bichon" "bichon-*-$(arch_resolve "x86_64" "aarch64")-unknown-linux-gnu.tar.gz" restore_backup if [ "$MIGRATE_V1" -eq 1 ]; then diff --git a/ct/birdnet-go.sh b/ct/birdnet-go.sh index 6b49a1cef..39db9ca1f 100644 --- a/ct/birdnet-go.sh +++ b/ct/birdnet-go.sh @@ -37,7 +37,7 @@ function update_script() { systemctl stop birdnet msg_ok "Stopped Service" - fetch_and_deploy_gh_release "birdnet" "tphakala/birdnet-go" "prebuild" "latest" "/opt/birdnet" "birdnet-go-linux-$(get_arch_value).tar.gz" + fetch_and_deploy_gh_release "birdnet" "tphakala/birdnet-go" "prebuild" "latest" "/opt/birdnet" "birdnet-go-linux-$(arch_resolve).tar.gz" msg_info "Deploying Binary" cp /opt/birdnet/birdnet-go /usr/local/bin/birdnet-go diff --git a/ct/blocky.sh b/ct/blocky.sh index ea01d8486..be0a01391 100644 --- a/ct/blocky.sh +++ b/ct/blocky.sh @@ -34,7 +34,7 @@ function update_script() { msg_ok "Stopped Service" create_backup /opt/blocky/config.yml - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_Linux_$(get_arch_value "x86_64" "arm64").tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_Linux_$(arch_resolve "x86_64" "arm64").tar.gz" restore_backup msg_info "Starting Service" diff --git a/ct/certimate.sh b/ct/certimate.sh index 34d66706c..24e948cca 100644 --- a/ct/certimate.sh +++ b/ct/certimate.sh @@ -37,7 +37,7 @@ function update_script() { create_backup /opt/certimate/pb_data - fetch_and_deploy_gh_release "certimate" "certimate-go/certimate" "prebuild" "latest" "/opt/certimate" "certimate_*_linux_$(get_arch_value).zip" + fetch_and_deploy_gh_release "certimate" "certimate-go/certimate" "prebuild" "latest" "/opt/certimate" "certimate_*_linux_$(arch_resolve).zip" restore_backup diff --git a/ct/cleanuparr.sh b/ct/cleanuparr.sh index 1cf034efa..f463e039c 100755 --- a/ct/cleanuparr.sh +++ b/ct/cleanuparr.sh @@ -35,7 +35,7 @@ function update_script() { create_backup /opt/cleanuparr/config - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Cleanuparr" "Cleanuparr/Cleanuparr" "prebuild" "latest" "/opt/cleanuparr" "*linux-$(get_arch_value).zip" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Cleanuparr" "Cleanuparr/Cleanuparr" "prebuild" "latest" "/opt/cleanuparr" "*linux-$(arch_resolve).zip" restore_backup diff --git a/ct/cliproxyapi.sh b/ct/cliproxyapi.sh index 610c5c7e3..cffa0fc17 100644 --- a/ct/cliproxyapi.sh +++ b/ct/cliproxyapi.sh @@ -36,7 +36,7 @@ function update_script() { systemctl stop cliproxyapi msg_ok "Stopped CLIProxyAPI" - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "cliproxyapi" "router-for-me/CLIProxyAPI" "prebuild" "latest" "/opt/cliproxyapi" "CLIProxyAPI_*_linux_$(get_arch_value "amd64" "aarch64").tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "cliproxyapi" "router-for-me/CLIProxyAPI" "prebuild" "latest" "/opt/cliproxyapi" "CLIProxyAPI_*_linux_$(arch_resolve "amd64" "aarch64").tar.gz" msg_info "Starting CLIProxyAPI" systemctl start cliproxyapi diff --git a/ct/cloudreve.sh b/ct/cloudreve.sh index a6c7a8ad3..1492e9530 100644 --- a/ct/cloudreve.sh +++ b/ct/cloudreve.sh @@ -34,7 +34,7 @@ function update_script() { systemctl stop cloudreve msg_info "Stopped Service" - fetch_and_deploy_gh_release "cloudreve" "cloudreve/cloudreve" "prebuild" "latest" "/opt/cloudreve" "*linux_$(get_arch_value).tar.gz" + fetch_and_deploy_gh_release "cloudreve" "cloudreve/cloudreve" "prebuild" "latest" "/opt/cloudreve" "*linux_$(arch_resolve).tar.gz" msg_info "Starting Service" systemctl start cloudreve diff --git a/ct/dagu.sh b/ct/dagu.sh index f9fca276f..42b2af198 100644 --- a/ct/dagu.sh +++ b/ct/dagu.sh @@ -37,7 +37,7 @@ function update_script() { create_backup /opt/dagu/data - fetch_and_deploy_gh_release "dagu" "dagucloud/dagu" "prebuild" "latest" "/opt/dagu" "dagu_*_linux_$(get_arch_value).tar.gz" + fetch_and_deploy_gh_release "dagu" "dagucloud/dagu" "prebuild" "latest" "/opt/dagu" "dagu_*_linux_$(arch_resolve).tar.gz" restore_backup diff --git a/ct/databasus.sh b/ct/databasus.sh index be1079e58..e07104331 100644 --- a/ct/databasus.sh +++ b/ct/databasus.sh @@ -45,7 +45,7 @@ function update_script() { # Install MongoDB Database Tools via direct .deb (no APT repo for Debian 13) if ! command -v mongodump &>/dev/null; then [[ "$(get_os_info id)" == "ubuntu" ]] && MONGO_DIST="ubuntu2204" || MONGO_DIST="debian12" - MONGO_ARCH=$(get_arch_value "x86_64" "arm64") + MONGO_ARCH=$(arch_resolve "x86_64" "arm64") # MongoDB only publishes arm64 builds for Ubuntu [[ "$MONGO_ARCH" == "arm64" ]] && MONGO_DIST="ubuntu2204" fetch_and_deploy_from_url "https://fastdl.mongodb.org/tools/db/mongodb-database-tools-${MONGO_DIST}-${MONGO_ARCH}-100.16.1.deb" @@ -77,7 +77,7 @@ function update_script() { cd /opt/databasus/backend $STD go mod download $STD /root/go/bin/swag init -g cmd/main.go -o swagger - $STD env CGO_ENABLED=0 GOOS=linux GOARCH=$(get_arch_value) go build -o databasus ./cmd/main.go + $STD env CGO_ENABLED=0 GOOS=linux GOARCH=$(arch_resolve) go build -o databasus ./cmd/main.go mv /opt/databasus/backend/databasus /opt/databasus/databasus mkdir -p /opt/databasus/ui/build cp -r /opt/databasus/frontend/dist/* /opt/databasus/ui/build/ diff --git a/ct/ddns-updater.sh b/ct/ddns-updater.sh index 0c61aee4e..9e5a3f6bf 100644 --- a/ct/ddns-updater.sh +++ b/ct/ddns-updater.sh @@ -35,7 +35,7 @@ function update_script() { create_backup /opt/ddns-updater/data - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "ddns-updater" "qdm12/ddns-updater" "singlefile" "latest" "/opt/ddns-updater" "ddns-updater_*_linux_$(get_arch_value)" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "ddns-updater" "qdm12/ddns-updater" "singlefile" "latest" "/opt/ddns-updater" "ddns-updater_*_linux_$(arch_resolve)" restore_backup diff --git a/ct/discopanel.sh b/ct/discopanel.sh index 0e6ea36c1..25a497d11 100644 --- a/ct/discopanel.sh +++ b/ct/discopanel.sh @@ -39,8 +39,8 @@ function update_script() { create_backup /opt/discopanel/data/discopanel.db - fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "prebuild" "latest" "/opt/discopanel" "discopanel-linux-$(get_arch_value).tar.gz" - ln -sf /opt/discopanel/discopanel-linux-$(get_arch_value) /opt/discopanel/discopanel + fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "prebuild" "latest" "/opt/discopanel" "discopanel-linux-$(arch_resolve).tar.gz" + ln -sf /opt/discopanel/discopanel-linux-$(arch_resolve) /opt/discopanel/discopanel restore_backup diff --git a/ct/donetick.sh b/ct/donetick.sh index 46bd633f4..7943886f6 100644 --- a/ct/donetick.sh +++ b/ct/donetick.sh @@ -38,7 +38,7 @@ function update_script() { create_backup /opt/donetick/config/selfhosted.yaml \ /opt/donetick/donetick.db - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "donetick" "donetick/donetick" "prebuild" "latest" "/opt/donetick" "donetick_Linux_$(get_arch_value "x86_64" "arm64").tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "donetick" "donetick/donetick" "prebuild" "latest" "/opt/donetick" "donetick_Linux_$(arch_resolve "x86_64" "arm64").tar.gz" restore_backup grep -q 'http://localhost"$' /opt/donetick/config/selfhosted.yaml || sed -i '/https:\/\/localhost"$/a\ - "http://localhost"' /opt/donetick/config/selfhosted.yaml diff --git a/ct/dynacat.sh b/ct/dynacat.sh index 30d20d3fd..9af9a77bf 100644 --- a/ct/dynacat.sh +++ b/ct/dynacat.sh @@ -39,7 +39,7 @@ function update_script() { /opt/dynacat/assets \ /opt/dynacat/data - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "dynacat" "Panonim/dynacat" "prebuild" "latest" "/opt/dynacat" "dynacat-linux-$(get_arch_value).tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "dynacat" "Panonim/dynacat" "prebuild" "latest" "/opt/dynacat" "dynacat-linux-$(arch_resolve).tar.gz" restore_backup chmod +x /opt/dynacat/dynacat diff --git a/ct/ebusd.sh b/ct/ebusd.sh index 7a82d9186..5dec97455 100644 --- a/ct/ebusd.sh +++ b/ct/ebusd.sh @@ -33,7 +33,7 @@ function update_script() { systemctl stop ebusd msg_ok "Stopped Services" - fetch_and_deploy_gh_release "ebusd" "john30/ebusd" "binary" "latest" "/opt/ebusd" "ebusd-*_$(get_arch_value)-trixie_mqtt1.deb" + fetch_and_deploy_gh_release "ebusd" "john30/ebusd" "binary" "latest" "/opt/ebusd" "ebusd-*_$(arch_resolve)-trixie_mqtt1.deb" msg_info "Starting Services" systemctl start ebusd diff --git a/ct/emqx.sh b/ct/emqx.sh index b2dcac825..189e76ced 100644 --- a/ct/emqx.sh +++ b/ct/emqx.sh @@ -42,8 +42,8 @@ function update_script() { msg_ok "Removed old EMQX" msg_info "Downloading EMQX v${RELEASE}" - DEB_FILE="/tmp/emqx-enterprise-${RELEASE}-debian12-$(get_arch_value).deb" - curl -fsSL -o "$DEB_FILE" "https://www.emqx.com/en/downloads/enterprise/v${RELEASE}/emqx-enterprise-${RELEASE}-debian12-$(get_arch_value).deb" + DEB_FILE="/tmp/emqx-enterprise-${RELEASE}-debian12-$(arch_resolve).deb" + curl -fsSL -o "$DEB_FILE" "https://www.emqx.com/en/downloads/enterprise/v${RELEASE}/emqx-enterprise-${RELEASE}-debian12-$(arch_resolve).deb" msg_ok "Downloaded EMQX" msg_info "Installing EMQX" diff --git a/ct/ersatztv.sh b/ct/ersatztv.sh index 303f8836f..876760b59 100644 --- a/ct/ersatztv.sh +++ b/ct/ersatztv.sh @@ -33,7 +33,7 @@ function update_script() { systemctl stop ersatzTV msg_ok "Stopped ErsatzTV" - fetch_and_deploy_gh_release "ersatztv" "ErsatzTV/ErsatzTV" "prebuild" "latest" "/opt/ErsatzTV" "*linux-$(get_arch_value "x64" "arm64").tar.gz" + fetch_and_deploy_gh_release "ersatztv" "ErsatzTV/ErsatzTV" "prebuild" "latest" "/opt/ErsatzTV" "*linux-$(arch_resolve "x64" "arm64").tar.gz" msg_info "Starting ErsatzTV" systemctl start ersatzTV @@ -47,7 +47,7 @@ function update_script() { systemctl stop ersatzTV msg_ok "Stopped ErsatzTV" - fetch_and_deploy_gh_release "ersatztv-ffmpeg" "ErsatzTV/ErsatzTV-ffmpeg" "prebuild" "latest" "/opt/ErsatzTV-ffmpeg" "*-$(get_arch_value "linux64" "linuxarm64")-gpl-7.1.tar.xz" + fetch_and_deploy_gh_release "ersatztv-ffmpeg" "ErsatzTV/ErsatzTV-ffmpeg" "prebuild" "latest" "/opt/ErsatzTV-ffmpeg" "*-$(arch_resolve "linux64" "linuxarm64")-gpl-7.1.tar.xz" msg_info "Set ErsatzTV-ffmpeg links" chmod +x /opt/ErsatzTV-ffmpeg/bin/* diff --git a/ct/ezbookkeeping.sh b/ct/ezbookkeeping.sh index 3ac227438..4035142d8 100644 --- a/ct/ezbookkeeping.sh +++ b/ct/ezbookkeeping.sh @@ -42,7 +42,7 @@ function update_script() { cp -r /opt/ezbookkeeping/storage /opt/ezbookkeeping-backup/storage/ msg_ok "Backed up configuration" - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "ezbookkeeping" "mayswind/ezbookkeeping" "prebuild" "latest" "/opt/ezbookkeeping" "ezbookkeeping-*-linux-$(get_arch_value).tar.gz" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "ezbookkeeping" "mayswind/ezbookkeeping" "prebuild" "latest" "/opt/ezbookkeeping" "ezbookkeeping-*-linux-$(arch_resolve).tar.gz" msg_info "Restoring configuration" cp -rf /opt/ezbookkeeping-backup/ezbookkeeping.ini /opt/ezbookkeeping/conf/ diff --git a/ct/forgejo.sh b/ct/forgejo.sh index d4bff7bc4..19c10aad6 100644 --- a/ct/forgejo.sh +++ b/ct/forgejo.sh @@ -33,7 +33,7 @@ function update_script() { systemctl stop forgejo msg_ok "Stopped Service" - fetch_and_deploy_codeberg_release "forgejo" "forgejo/forgejo" "singlefile" "latest" "/opt/forgejo" "forgejo-*-linux-$(get_arch_value)" + fetch_and_deploy_codeberg_release "forgejo" "forgejo/forgejo" "singlefile" "latest" "/opt/forgejo" "forgejo-*-linux-$(arch_resolve)" ln -sf /opt/forgejo/forgejo /usr/local/bin/forgejo if grep -q "GITEA_WORK_DIR" /etc/systemd/system/forgejo.service; then diff --git a/install/adguard-install.sh b/install/adguard-install.sh index 569abb07e..37c80e318 100644 --- a/install/adguard-install.sh +++ b/install/adguard-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "AdGuardHome" "AdguardTeam/AdGuardHome" "prebuild" "latest" "/opt/AdGuardHome" "AdGuardHome_linux_$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "AdGuardHome" "AdguardTeam/AdGuardHome" "prebuild" "latest" "/opt/AdGuardHome" "AdGuardHome_linux_$(arch_resolve).tar.gz" msg_info "Creating Service" cat </etc/systemd/system/AdGuardHome.service diff --git a/install/agentdvr-install.sh b/install/agentdvr-install.sh index ab066b459..c91fbc067 100644 --- a/install/agentdvr-install.sh +++ b/install/agentdvr-install.sh @@ -25,13 +25,13 @@ msg_ok "Installed Dependencies" msg_info "Installing AgentDVR" mkdir -p /opt/agentdvr/agent -RELEASE=$(curl -fsSL "https://www.ispyconnect.com/api/Agent/DownloadLocation4?platform=$(get_arch_value "Linux64" "LinuxARM64")&fromVersion=0" | grep -o 'https://.*\.zip') +RELEASE=$(curl -fsSL "https://www.ispyconnect.com/api/Agent/DownloadLocation4?platform=$(arch_resolve "Linux64" "LinuxARM64")&fromVersion=0" | grep -o 'https://.*\.zip') cd /opt/agentdvr/agent curl -fsSL "$RELEASE" -o $(basename "$RELEASE") -$STD unzip Agent_$(get_arch_value "Linux64" "LinuxARM64")*.zip +$STD unzip Agent_$(arch_resolve "Linux64" "LinuxARM64")*.zip chmod +x ./Agent echo $RELEASE >~/.agentdvr -rm -rf Agent_$(get_arch_value "Linux64" "LinuxARM64")*.zip +rm -rf Agent_$(arch_resolve "Linux64" "LinuxARM64")*.zip msg_ok "Installed AgentDVR" msg_info "Creating Service" diff --git a/install/alpine-adguard-install.sh b/install/alpine-adguard-install.sh index 383c73e59..d1446bfcb 100644 --- a/install/alpine-adguard-install.sh +++ b/install/alpine-adguard-install.sh @@ -14,13 +14,13 @@ network_check update_os msg_info "Downloading AdGuard Home" -$STD curl -fsSL -o /tmp/AdGuardHome_linux_$(get_arch_value).tar.gz \ -"https://github.com/AdguardTeam/AdGuardHome/releases/latest/download/AdGuardHome_linux_$(get_arch_value).tar.gz" +$STD curl -fsSL -o /tmp/AdGuardHome_linux_$(arch_resolve).tar.gz \ +"https://github.com/AdguardTeam/AdGuardHome/releases/latest/download/AdGuardHome_linux_$(arch_resolve).tar.gz" msg_ok "Downloaded AdGuard Home" msg_info "Installing AdGuard Home" -$STD tar -xzf /tmp/AdGuardHome_linux_$(get_arch_value).tar.gz -C /opt -$STD rm /tmp/AdGuardHome_linux_$(get_arch_value).tar.gz +$STD tar -xzf /tmp/AdGuardHome_linux_$(arch_resolve).tar.gz -C /opt +$STD rm /tmp/AdGuardHome_linux_$(arch_resolve).tar.gz msg_ok "Installed AdGuard Home" msg_info "Creating AdGuard Home Service" diff --git a/install/alpine-docker-install.sh b/install/alpine-docker-install.sh index 5896c25ec..a827671c2 100644 --- a/install/alpine-docker-install.sh +++ b/install/alpine-docker-install.sh @@ -62,7 +62,7 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION" DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} mkdir -p "$DOCKER_CONFIG"/cli-plugins - curl -fsSL https://github.com/docker/compose/releases/download/"$DOCKER_COMPOSE_LATEST_VERSION"/docker-compose-linux-$(get_arch_value "x86_64" "aarch64") -o ~/.docker/cli-plugins/docker-compose + curl -fsSL https://github.com/docker/compose/releases/download/"$DOCKER_COMPOSE_LATEST_VERSION"/docker-compose-linux-$(arch_resolve "x86_64" "aarch64") -o ~/.docker/cli-plugins/docker-compose chmod +x "$DOCKER_CONFIG"/cli-plugins/docker-compose msg_ok "Installed Docker Compose $DOCKER_COMPOSE_LATEST_VERSION" fi diff --git a/install/alpine-garage-install.sh b/install/alpine-garage-install.sh index ccc1b2c26..461617e95 100644 --- a/install/alpine-garage-install.sh +++ b/install/alpine-garage-install.sh @@ -18,7 +18,7 @@ $STD apk add --no-cache openssl msg_ok "Installed Dependencies" GITEA_RELEASE=$(curl -s https://api.github.com/repos/deuxfleurs-org/garage/tags | jq -r '.[0].name') -curl -fsSL "https://garagehq.deuxfleurs.fr/_releases/${GITEA_RELEASE}/$(get_arch_value "x86_64" "aarch64")-unknown-linux-musl/garage" -o /usr/local/bin/garage +curl -fsSL "https://garagehq.deuxfleurs.fr/_releases/${GITEA_RELEASE}/$(arch_resolve "x86_64" "aarch64")-unknown-linux-musl/garage" -o /usr/local/bin/garage chmod +x /usr/local/bin/garage mkdir -p /var/lib/garage/{data,meta,snapshots} mkdir -p /etc/garage diff --git a/install/alpine-rclone-install.sh b/install/alpine-rclone-install.sh index 1e76a1aec..bff112d6c 100644 --- a/install/alpine-rclone-install.sh +++ b/install/alpine-rclone-install.sh @@ -22,7 +22,7 @@ msg_info "Installing rclone" temp_file=$(mktemp) mkdir -p /opt/rclone RELEASE=$(curl -s https://api.github.com/repos/rclone/rclone/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -curl -fsSL "https://github.com/rclone/rclone/releases/download/v${RELEASE}/rclone-v${RELEASE}-linux-$(get_arch_value).zip" -o "$temp_file" +curl -fsSL "https://github.com/rclone/rclone/releases/download/v${RELEASE}/rclone-v${RELEASE}-linux-$(arch_resolve).zip" -o "$temp_file" $STD unzip -j "$temp_file" '*/**' -d /opt/rclone cd /opt/rclone RCLONE_PASSWORD=$(head -c 16 /dev/urandom | xxd -p -c 16) diff --git a/install/alpine-redlib-install.sh b/install/alpine-redlib-install.sh index 8afce8489..efa24ae89 100644 --- a/install/alpine-redlib-install.sh +++ b/install/alpine-redlib-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "redlib" "redlib-org/redlib" "prebuild" "latest" "/opt/redlib" "redlib-$(get_arch_value "x86_64" "aarch64")-unknown-linux-musl.tar.gz" +fetch_and_deploy_gh_release "redlib" "redlib-org/redlib" "prebuild" "latest" "/opt/redlib" "redlib-$(arch_resolve "x86_64" "aarch64")-unknown-linux-musl.tar.gz" msg_info "Configuring Redlib" cat </opt/redlib/redlib.conf diff --git a/install/alpine-rustdeskserver-install.sh b/install/alpine-rustdeskserver-install.sh index df7ee1036..58ded10b9 100644 --- a/install/alpine-rustdeskserver-install.sh +++ b/install/alpine-rustdeskserver-install.sh @@ -16,7 +16,7 @@ update_os RELEASE=$(curl -s https://api.github.com/repos/lejianwen/rustdesk-server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') msg_info "Installing RustDesk Server v${RELEASE}" temp_file1=$(mktemp) -ARCH=$(get_arch_value "amd64" "arm64v8") +ARCH=$(arch_resolve "amd64" "arm64v8") curl -fsSL "https://github.com/lejianwen/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-linux-${ARCH}.zip" -o "$temp_file1" $STD unzip "$temp_file1" mv "$ARCH" /opt/rustdesk-server @@ -34,7 +34,7 @@ msg_ok "Installed RustDesk Server v${RELEASE}" APIRELEASE=$(curl -s https://api.github.com/repos/lejianwen/rustdesk-api/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') msg_info "Installing RustDesk API v${APIRELEASE}" temp_file2=$(mktemp) -curl -fsSL "https://github.com/lejianwen/rustdesk-api/releases/download/v${APIRELEASE}/linux-$(get_arch_value).tar.gz" -o "$temp_file2" +curl -fsSL "https://github.com/lejianwen/rustdesk-api/releases/download/v${APIRELEASE}/linux-$(arch_resolve).tar.gz" -o "$temp_file2" $STD tar zxvf "$temp_file2" mv release /opt/rustdesk-api cd /opt/rustdesk-api diff --git a/install/alpine-tinyauth-install.sh b/install/alpine-tinyauth-install.sh index ae150058b..e9d26a1fa 100644 --- a/install/alpine-tinyauth-install.sh +++ b/install/alpine-tinyauth-install.sh @@ -20,7 +20,7 @@ msg_ok "Installed Dependencies" msg_info "Installing Tinyauth" mkdir -p /opt/tinyauth RELEASE=$(curl -s https://api.github.com/repos/tinyauthapp/tinyauth/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -curl -fsSL "https://github.com/tinyauthapp/tinyauth/releases/download/v${RELEASE}/tinyauth-$(get_arch_value)" -o /opt/tinyauth/tinyauth +curl -fsSL "https://github.com/tinyauthapp/tinyauth/releases/download/v${RELEASE}/tinyauth-$(arch_resolve)" -o /opt/tinyauth/tinyauth chmod +x /opt/tinyauth/tinyauth PASS=$(openssl rand -base64 8 | tr -dc 'a-zA-Z0-9' | head -c 8) USER=$(htpasswd -Bbn "tinyauth" "${PASS}") diff --git a/install/alpine-wakapi-install.sh b/install/alpine-wakapi-install.sh index cbb967eb8..10a38b742 100644 --- a/install/alpine-wakapi-install.sh +++ b/install/alpine-wakapi-install.sh @@ -20,7 +20,7 @@ $STD apk add --no-cache \ $STD update-ca-certificates msg_ok "Installed Dependencies" -fetch_and_deploy_gh_release "wakapi" "muety/wakapi" "prebuild" "latest" "/opt/wakapi" "wakapi_linux_$(get_arch_value).zip" +fetch_and_deploy_gh_release "wakapi" "muety/wakapi" "prebuild" "latest" "/opt/wakapi" "wakapi_linux_$(arch_resolve).zip" msg_info "Configuring Wakapi" LOCAL_IP=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) diff --git a/install/anytype-server-install.sh b/install/anytype-server-install.sh index 36fc2dc0e..8c36f0288 100644 --- a/install/anytype-server-install.sh +++ b/install/anytype-server-install.sh @@ -42,7 +42,7 @@ $STD apt install -y redis-stack-server systemctl enable -q --now redis-stack-server msg_ok "Installed Redis Stack" -fetch_and_deploy_gh_release "anytype" "grishy/any-sync-bundle" "prebuild" "latest" "/opt/anytype" "any-sync-bundle_*_linux_$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "anytype" "grishy/any-sync-bundle" "prebuild" "latest" "/opt/anytype" "any-sync-bundle_*_linux_$(arch_resolve).tar.gz" chmod +x /opt/anytype/any-sync-bundle msg_info "Configuring Anytype" diff --git a/install/apache-tomcat-install.sh b/install/apache-tomcat-install.sh index 2de5481c4..73b2bc169 100644 --- a/install/apache-tomcat-install.sh +++ b/install/apache-tomcat-install.sh @@ -80,7 +80,7 @@ After=network.target Type=forking User=$(whoami) Group=$(whoami) -Environment=JAVA_HOME=/usr/lib/jvm/temurin-${jdk_version}-jdk-$(get_arch_value) +Environment=JAVA_HOME=/usr/lib/jvm/temurin-${jdk_version}-jdk-$(arch_resolve) Environment=CATALINA_HOME=/opt/tomcat-$TOMCAT_VERSION Environment=CATALINA_BASE=/opt/tomcat-$TOMCAT_VERSION Environment=CATALINA_PID=/opt/tomcat-$TOMCAT_VERSION/temp/tomcat.pid diff --git a/install/argus-install.sh b/install/argus-install.sh index 367a464a2..06ab10a78 100644 --- a/install/argus-install.sh +++ b/install/argus-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "Argus" "release-argus/Argus" "singlefile" "latest" "/opt/argus" "Argus*linux-$(get_arch_value)" +fetch_and_deploy_gh_release "Argus" "release-argus/Argus" "singlefile" "latest" "/opt/argus" "Argus*linux-$(arch_resolve)" msg_info "Setup Argus Config" cat </opt/argus/config.yml diff --git a/install/authentik-install.sh b/install/authentik-install.sh index a539c0d03..13e4fbe3d 100644 --- a/install/authentik-install.sh +++ b/install/authentik-install.sh @@ -42,8 +42,8 @@ $STD apt install -y \ libtool \ libtool-bin \ gcc \ - crossbuild-essential-$(get_arch_value) \ - gcc-$(get_arch_value "x86-64" "aarch64")-linux-gnu \ + crossbuild-essential-$(arch_resolve) \ + gcc-$(arch_resolve "x86-64" "aarch64")-linux-gnu \ cmake \ clang \ libunwind-18-dev \ @@ -90,7 +90,7 @@ msg_ok "Setup web" msg_info "Setting up go proxy" cd /opt/authentik export CGO_ENABLED="1" -export CC="$(get_arch_value "x86_64" "aarch64")-linux-gnu-gcc" +export CC="$(arch_resolve "x86_64" "aarch64")-linux-gnu-gcc" $STD go mod download $STD go build -o /opt/authentik/authentik-server ./cmd/server $STD go build -o /opt/authentik/ldap ./cmd/ldap diff --git a/install/autobrr-install.sh b/install/autobrr-install.sh index acbfc71b9..41d8a8e00 100644 --- a/install/autobrr-install.sh +++ b/install/autobrr-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "autobrr" "autobrr/autobrr" "prebuild" "latest" "/usr/local/bin" "autobrr_*_linux_$(get_arch_value "x86_64" "arm64").tar.gz" +fetch_and_deploy_gh_release "autobrr" "autobrr/autobrr" "prebuild" "latest" "/usr/local/bin" "autobrr_*_linux_$(arch_resolve "x86_64" "arm64").tar.gz" msg_info "Configuring Autobrr" mkdir -p /root/.config/autobrr diff --git a/install/autocaliweb-install.sh b/install/autocaliweb-install.sh index 10c7e8a9d..8b5af83ef 100644 --- a/install/autocaliweb-install.sh +++ b/install/autocaliweb-install.sh @@ -45,9 +45,9 @@ $STD apt install -y --no-install-recommends \ zip msg_ok "Installed dependencies" -fetch_and_deploy_gh_release "kepubify" "pgaskin/kepubify" "singlefile" "latest" "/usr/bin" "kepubify-linux-$(get_arch_value "64bit" "arm64")" +fetch_and_deploy_gh_release "kepubify" "pgaskin/kepubify" "singlefile" "latest" "/usr/bin" "kepubify-linux-$(arch_resolve "64bit" "arm64")" KEPUB_VERSION="$(/usr/bin/kepubify --version | awk '{print $2}')" -fetch_and_deploy_gh_release "calibre" "kovidgoyal/calibre" "prebuild" "latest" "/opt/calibre" "calibre-*-$(get_arch_value "x86_64" "arm64").txz" +fetch_and_deploy_gh_release "calibre" "kovidgoyal/calibre" "prebuild" "latest" "/opt/calibre" "calibre-*-$(arch_resolve "x86_64" "arm64").txz" msg_info "Installing Calibre" $STD /opt/calibre/calibre_postinstall diff --git a/install/backrest-install.sh b/install/backrest-install.sh index 97bfb6613..91155ab2b 100644 --- a/install/backrest-install.sh +++ b/install/backrest-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "backrest" "garethgeorge/backrest" "prebuild" "latest" "/opt/backrest/bin" "backrest_Linux_$(get_arch_value "x86_64" "arm64").tar.gz" +fetch_and_deploy_gh_release "backrest" "garethgeorge/backrest" "prebuild" "latest" "/opt/backrest/bin" "backrest_Linux_$(arch_resolve "x86_64" "arm64").tar.gz" msg_info "Creating Service" cat </opt/backrest/.env diff --git a/install/beszel-install.sh b/install/beszel-install.sh index e6e8659a9..5bbed170c 100644 --- a/install/beszel-install.sh +++ b/install/beszel-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "beszel" "henrygd/beszel" "prebuild" "latest" "/opt/beszel" "beszel_linux_$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "beszel" "henrygd/beszel" "prebuild" "latest" "/opt/beszel" "beszel_linux_$(arch_resolve).tar.gz" msg_info "Creating Service" cat </etc/systemd/system/beszel-hub.service diff --git a/install/bichon-install.sh b/install/bichon-install.sh index 9401cbc00..0345e7302 100644 --- a/install/bichon-install.sh +++ b/install/bichon-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "bichon" "rustmailer/bichon" "prebuild" "latest" "/opt/bichon" "bichon-*-$(get_arch_value "x86_64" "aarch64")-unknown-linux-gnu.tar.gz" +fetch_and_deploy_gh_release "bichon" "rustmailer/bichon" "prebuild" "latest" "/opt/bichon" "bichon-*-$(arch_resolve "x86_64" "aarch64")-unknown-linux-gnu.tar.gz" read -r -p "${TAB3}Enter the public URL for Bichon (e.g., https://bichon.yourdomain.com) or leave empty to use container IP: " bichon_url if [[ -z "$bichon_url" ]]; then diff --git a/install/birdnet-go-install.sh b/install/birdnet-go-install.sh index 319ce598a..b3dfcab8e 100644 --- a/install/birdnet-go-install.sh +++ b/install/birdnet-go-install.sh @@ -21,7 +21,7 @@ $STD apt install -y \ ffmpeg msg_ok "Installed Dependencies" -fetch_and_deploy_gh_release "birdnet" "tphakala/birdnet-go" "prebuild" "latest" "/opt/birdnet" "birdnet-go-linux-$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "birdnet" "tphakala/birdnet-go" "prebuild" "latest" "/opt/birdnet" "birdnet-go-linux-$(arch_resolve).tar.gz" msg_info "Setting up BirdNET-Go" cp /opt/birdnet/birdnet-go /usr/local/bin/birdnet-go diff --git a/install/bitfocus-companion-install.sh b/install/bitfocus-companion-install.sh index 4f4fa6405..fbf05cd98 100644 --- a/install/bitfocus-companion-install.sh +++ b/install/bitfocus-companion-install.sh @@ -19,9 +19,9 @@ msg_ok "Installed Dependencies" msg_info "Fetching Latest Bitfocus Companion Release" RELEASE_JSON=$(curl -fsSL "https://api.bitfocus.io/v1/product/companion/packages?limit=20") -COMPANION_ARCH=$(get_arch_value "x64" "arm64") +COMPANION_ARCH=$(arch_resolve "x64" "arm64") PACKAGE_JSON=$(echo "$RELEASE_JSON" | jq -c \ - --arg target "linux-$(get_arch_value "tgz" "arm64-tgz")" \ + --arg target "linux-$(arch_resolve "tgz" "arm64-tgz")" \ --arg arch "linux-$COMPANION_ARCH" \ '(if type == "array" then . else .packages end) | [.[] | select(.target==$target and (.uri | contains($arch)))] | first') RELEASE=$(echo "$PACKAGE_JSON" | jq -r '.version // empty') diff --git a/install/blocky-install.sh b/install/blocky-install.sh index 6cd94016a..0e28f89f1 100644 --- a/install/blocky-install.sh +++ b/install/blocky-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_Linux_$(get_arch_value "x86_64" "arm64").tar.gz" +fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_Linux_$(arch_resolve "x86_64" "arm64").tar.gz" msg_info "Configuring Blocky" if systemctl is-active systemd-resolved >/dev/null 2>&1; then diff --git a/install/certimate-install.sh b/install/certimate-install.sh index 4a72a7939..a81ac8392 100644 --- a/install/certimate-install.sh +++ b/install/certimate-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "certimate" "certimate-go/certimate" "prebuild" "latest" "/opt/certimate" "certimate_*_linux_$(get_arch_value).zip" +fetch_and_deploy_gh_release "certimate" "certimate-go/certimate" "prebuild" "latest" "/opt/certimate" "certimate_*_linux_$(arch_resolve).zip" msg_info "Creating Service" cat <<'EOF' >/etc/systemd/system/certimate.service diff --git a/install/cleanuparr-install.sh b/install/cleanuparr-install.sh index 397d23e64..0277f7a0b 100755 --- a/install/cleanuparr-install.sh +++ b/install/cleanuparr-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "Cleanuparr" "Cleanuparr/Cleanuparr" "prebuild" "latest" "/opt/cleanuparr" "*linux-$(get_arch_value).zip" +fetch_and_deploy_gh_release "Cleanuparr" "Cleanuparr/Cleanuparr" "prebuild" "latest" "/opt/cleanuparr" "*linux-$(arch_resolve).zip" msg_info "Creating Service" cat </etc/systemd/system/cleanuparr.service diff --git a/install/cliproxyapi-install.sh b/install/cliproxyapi-install.sh index 17312b9e5..a13a5b213 100644 --- a/install/cliproxyapi-install.sh +++ b/install/cliproxyapi-install.sh @@ -17,7 +17,7 @@ msg_info "Installing Dependencies" $STD apt install -y openssl msg_ok "Installed Dependencies" -fetch_and_deploy_gh_release "cliproxyapi" "router-for-me/CLIProxyAPI" "prebuild" "latest" "/opt/cliproxyapi" "CLIProxyAPI_*_linux_$(get_arch_value "amd64" "aarch64").tar.gz" +fetch_and_deploy_gh_release "cliproxyapi" "router-for-me/CLIProxyAPI" "prebuild" "latest" "/opt/cliproxyapi" "CLIProxyAPI_*_linux_$(arch_resolve "amd64" "aarch64").tar.gz" msg_info "Configuring CLIProxyAPI" MANAGEMENT_PASSWORD=$(openssl rand -hex 32) diff --git a/install/cloudreve-install.sh b/install/cloudreve-install.sh index 6f5c411a4..0e9fe84c1 100644 --- a/install/cloudreve-install.sh +++ b/install/cloudreve-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "cloudreve" "cloudreve/cloudreve" "prebuild" "latest" "/opt/cloudreve" "*linux_$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "cloudreve" "cloudreve/cloudreve" "prebuild" "latest" "/opt/cloudreve" "*linux_$(arch_resolve).tar.gz" msg_info "Setup Service" cat </etc/systemd/system/cloudreve.service diff --git a/install/cockpit-install.sh b/install/cockpit-install.sh index 90f06593d..982250834 100644 --- a/install/cockpit-install.sh +++ b/install/cockpit-install.sh @@ -31,7 +31,7 @@ sed -i "s/root//g" /etc/cockpit/disallowed-users msg_ok "Installed Cockpit" # 45Drives only publishes amd64 packages -[[ "$(get_arch_value)" == "arm64" ]] || read -r -p "Would you like to install 45Drives' cockpit-file-sharing, cockpit-identities, and cockpit-navigator " prompt +[[ "$(arch_resolve)" == "arm64" ]] || read -r -p "Would you like to install 45Drives' cockpit-file-sharing, cockpit-identities, and cockpit-navigator " prompt if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then install_45drives=true if [[ "${VERSION_ID}" -ge 13 ]]; then diff --git a/install/configarr-install.sh b/install/configarr-install.sh index 423a745c0..704626d58 100644 --- a/install/configarr-install.sh +++ b/install/configarr-install.sh @@ -17,7 +17,7 @@ msg_info "Installing Dependencies" $STD apt install -y git msg_ok "Installed Dependencies" -fetch_and_deploy_gh_release "configarr" "raydak-labs/configarr" "prebuild" "latest" "/opt/configarr" "configarr-linux-$(get_arch_value "x64" "arm64").tar.xz" +fetch_and_deploy_gh_release "configarr" "raydak-labs/configarr" "prebuild" "latest" "/opt/configarr" "configarr-linux-$(arch_resolve "x64" "arm64").tar.xz" msg_info "Setup Configarr" cat </opt/configarr/.env diff --git a/install/cosmos-install.sh b/install/cosmos-install.sh index 74c6450ca..04e75422a 100644 --- a/install/cosmos-install.sh +++ b/install/cosmos-install.sh @@ -25,7 +25,7 @@ $STD apt install -y \ msg_ok "Installed Dependencies" setup_docker -fetch_and_deploy_gh_release "cosmos" "azukaar/Cosmos-Server" "prebuild" "latest" "/opt/cosmos" "cosmos-cloud-*-$(get_arch_value).zip" +fetch_and_deploy_gh_release "cosmos" "azukaar/Cosmos-Server" "prebuild" "latest" "/opt/cosmos" "cosmos-cloud-*-$(arch_resolve).zip" msg_info "Setting up Cosmos" cd /opt/cosmos diff --git a/install/crafty-controller-install.sh b/install/crafty-controller-install.sh index 87a1b3a24..935c5870b 100644 --- a/install/crafty-controller-install.sh +++ b/install/crafty-controller-install.sh @@ -16,7 +16,7 @@ update_os msg_info "Setting up TemurinJDK" setup_java $STD apt install -y temurin-{8,11,17,21,25}-jre -$STD update-alternatives --set java /usr/lib/jvm/temurin-25-jre-$(get_arch_value)/bin/java +$STD update-alternatives --set java /usr/lib/jvm/temurin-25-jre-$(arch_resolve)/bin/java msg_ok "Installed TemurinJDK" msg_info "Setup Python3" @@ -52,7 +52,7 @@ After=network.target Type=simple User=crafty WorkingDirectory=/opt/crafty-controller/crafty/crafty-4 -Environment=PATH=/usr/lib/jvm/temurin-25-jre-$(get_arch_value)/bin:/opt/crafty-controller/crafty/.venv/bin:$PATH +Environment=PATH=/usr/lib/jvm/temurin-25-jre-$(arch_resolve)/bin:/opt/crafty-controller/crafty/.venv/bin:$PATH ExecStart=/opt/crafty-controller/crafty/.venv/bin/python3 main.py -d Restart=on-failure diff --git a/install/dagu-install.sh b/install/dagu-install.sh index 560ff3349..e3e2ba0f9 100644 --- a/install/dagu-install.sh +++ b/install/dagu-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "dagu" "dagucloud/dagu" "prebuild" "latest" "/opt/dagu" "dagu_*_linux_$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "dagu" "dagucloud/dagu" "prebuild" "latest" "/opt/dagu" "dagu_*_linux_$(arch_resolve).tar.gz" msg_info "Setting up Dagu" mkdir -p /opt/dagu/data diff --git a/install/databasus-install.sh b/install/databasus-install.sh index fe8a92b15..c9808d3e2 100644 --- a/install/databasus-install.sh +++ b/install/databasus-install.sh @@ -35,7 +35,7 @@ done # MongoDB only publishes arm64 builds for Ubuntu [[ "$MONGO_ARCH" == "arm64" ]] && MONGO_DIST="ubuntu2204" MONGO_VERSION=$(get_latest_gh_tag "mongodb/mongo-tools" "100." || echo "100.16.1") -fetch_and_deploy_from_url "https://fastdl.mongodb.org/tools/db/mongodb-database-tools-${MONGO_DIST}-$(get_arch_value "x86_64" "arm64")-${MONGO_VERSION}.deb" "" +fetch_and_deploy_from_url "https://fastdl.mongodb.org/tools/db/mongodb-database-tools-${MONGO_DIST}-$(arch_resolve "x86_64" "arm64")-${MONGO_VERSION}.deb" "" mkdir -p /usr/local/mongodb-database-tools/bin [[ -f /usr/bin/mongodump ]] && ln -sf /usr/bin/mongodump /usr/local/mongodb-database-tools/bin/mongodump [[ -f /usr/bin/mongorestore ]] && ln -sf /usr/bin/mongorestore /usr/local/mongodb-database-tools/bin/mongorestore @@ -65,7 +65,7 @@ $STD go mod tidy $STD go mod download $STD go install github.com/swaggo/swag/cmd/swag@latest $STD /root/go/bin/swag init -g cmd/main.go -o swagger -$STD env CGO_ENABLED=0 GOOS=linux GOARCH=$(get_arch_value) go build -o databasus ./cmd/main.go +$STD env CGO_ENABLED=0 GOOS=linux GOARCH=$(arch_resolve) go build -o databasus ./cmd/main.go mv /opt/databasus/backend/databasus /opt/databasus/databasus mkdir -p /databasus-data/{pgdata,temp,backups,data,logs} mkdir -p /opt/databasus/ui/build diff --git a/install/ddns-updater-install.sh b/install/ddns-updater-install.sh index 68f4e08ce..675193f9f 100644 --- a/install/ddns-updater-install.sh +++ b/install/ddns-updater-install.sh @@ -12,7 +12,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "ddns-updater" "qdm12/ddns-updater" "singlefile" "latest" "/opt/ddns-updater" "ddns-updater_*_linux_$(get_arch_value)" +fetch_and_deploy_gh_release "ddns-updater" "qdm12/ddns-updater" "singlefile" "latest" "/opt/ddns-updater" "ddns-updater_*_linux_$(arch_resolve)" msg_info "Configuring DDNS-Updater" mkdir -p /opt/ddns-updater/data diff --git a/install/deconz-install.sh b/install/deconz-install.sh index ce1e312e3..7be1c7bc7 100644 --- a/install/deconz-install.sh +++ b/install/deconz-install.sh @@ -22,8 +22,8 @@ setup_deb822_repo \ msg_ok "Setup Phoscon Repository" msg_info "Installing deConz" -pool="$(get_arch_value "https://security.ubuntu.com/ubuntu/pool/main/o/openssl/" "http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/")" -libssl=$(curl -fsSL --proto '=http,https' "$pool" | grep -o "libssl1\.1_1\.1\.1f-1ubuntu2\.2[^\"]*$(get_arch_value)\.deb" | head -n1) +pool="$(arch_resolve "https://security.ubuntu.com/ubuntu/pool/main/o/openssl/" "http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/")" +libssl=$(curl -fsSL --proto '=http,https' "$pool" | grep -o "libssl1\.1_1\.1\.1f-1ubuntu2\.2[^\"]*$(arch_resolve)\.deb" | head -n1) curl -fsSL --proto '=http,https' "$pool$libssl" -o "$libssl" $STD dpkg -i "$libssl" $STD apt install -y deconz diff --git a/install/discopanel-install.sh b/install/discopanel-install.sh index b77288c5c..199b84d6e 100644 --- a/install/discopanel-install.sh +++ b/install/discopanel-install.sh @@ -12,7 +12,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "prebuild" "latest" "/opt/discopanel" "discopanel-linux-$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "discopanel" "nickheyer/discopanel" "prebuild" "latest" "/opt/discopanel" "discopanel-linux-$(arch_resolve).tar.gz" setup_docker msg_info "Creating Service" @@ -23,7 +23,7 @@ After=network.target [Service] WorkingDirectory=/opt/discopanel -ExecStart=/opt/discopanel/discopanel-linux-$(get_arch_value) +ExecStart=/opt/discopanel/discopanel-linux-$(arch_resolve) Restart=always [Install] diff --git a/install/donetick-install.sh b/install/donetick-install.sh index e144089d3..1c800bee5 100644 --- a/install/donetick-install.sh +++ b/install/donetick-install.sh @@ -17,7 +17,7 @@ msg_info "Installing Dependencies" $STD apt install -y ca-certificates msg_ok "Installed Dependencies" -fetch_and_deploy_gh_release "donetick" "donetick/donetick" "prebuild" "latest" "/opt/donetick" "donetick_Linux_$(get_arch_value "x86_64" "arm64").tar.gz" +fetch_and_deploy_gh_release "donetick" "donetick/donetick" "prebuild" "latest" "/opt/donetick" "donetick_Linux_$(arch_resolve "x86_64" "arm64").tar.gz" msg_info "Setup Donetick" cd /opt/donetick diff --git a/install/duplicati-install.sh b/install/duplicati-install.sh index f73ac3b2e..ab6d1a7fd 100644 --- a/install/duplicati-install.sh +++ b/install/duplicati-install.sh @@ -20,7 +20,7 @@ $STD apt install -y \ libfontconfig1 msg_ok "Installed Dependencies" -fetch_and_deploy_gh_release "duplicati" "duplicati/duplicati" "binary" "latest" "/opt/duplicati" "duplicati-*-linux-$(get_arch_value "x64" "arm64")-gui.deb" +fetch_and_deploy_gh_release "duplicati" "duplicati/duplicati" "binary" "latest" "/opt/duplicati" "duplicati-*-linux-$(arch_resolve "x64" "arm64")-gui.deb" msg_info "Configuring duplicati" DECRYPTKEY=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13) diff --git a/install/dynacat-install.sh b/install/dynacat-install.sh index b3d5efdf4..16ef757ae 100644 --- a/install/dynacat-install.sh +++ b/install/dynacat-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "dynacat" "Panonim/dynacat" "prebuild" "latest" "/opt/dynacat" "dynacat-linux-$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "dynacat" "Panonim/dynacat" "prebuild" "latest" "/opt/dynacat" "dynacat-linux-$(arch_resolve).tar.gz" msg_info "Setting up Dynacat" mkdir -p /opt/dynacat/config /opt/dynacat/assets /opt/dynacat/data diff --git a/install/ebusd-install.sh b/install/ebusd-install.sh index 0af646e1a..fd8d776e5 100644 --- a/install/ebusd-install.sh +++ b/install/ebusd-install.sh @@ -14,7 +14,7 @@ network_check update_os msg_info "Installing ebusd" -fetch_and_deploy_gh_release "ebusd" "john30/ebusd" "binary" "latest" "" "ebusd-*_$(get_arch_value)-trixie_mqtt1.deb" +fetch_and_deploy_gh_release "ebusd" "john30/ebusd" "binary" "latest" "" "ebusd-*_$(arch_resolve)-trixie_mqtt1.deb" systemctl enable -q ebusd msg_ok "Installed ebusd" diff --git a/install/emqx-install.sh b/install/emqx-install.sh index df43a996b..d08a6d6a1 100644 --- a/install/emqx-install.sh +++ b/install/emqx-install.sh @@ -25,8 +25,8 @@ if [[ -z "$LATEST_VERSION" ]]; then fi msg_ok "Latest version: v$LATEST_VERSION" -DOWNLOAD_URL="https://www.emqx.com/en/downloads/enterprise/v$LATEST_VERSION/emqx-enterprise-${LATEST_VERSION}-debian12-$(get_arch_value).deb" -DEB_FILE="/tmp/emqx-enterprise-${LATEST_VERSION}-debian12-$(get_arch_value).deb" +DOWNLOAD_URL="https://www.emqx.com/en/downloads/enterprise/v$LATEST_VERSION/emqx-enterprise-${LATEST_VERSION}-debian12-$(arch_resolve).deb" +DEB_FILE="/tmp/emqx-enterprise-${LATEST_VERSION}-debian12-$(arch_resolve).deb" msg_info "Downloading EMQX v$LATEST_VERSION" $STD curl -fsSL -o "$DEB_FILE" "$DOWNLOAD_URL" diff --git a/install/erpnext-install.sh b/install/erpnext-install.sh index 6daf14b5c..5e1b60cb1 100644 --- a/install/erpnext-install.sh +++ b/install/erpnext-install.sh @@ -51,7 +51,7 @@ $STD systemctl restart mariadb msg_ok "Configured MariaDB for ERPNext" msg_info "Installing wkhtmltopdf" -WKHTMLTOPDF_URL="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_$(get_arch_value).deb" +WKHTMLTOPDF_URL="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_$(arch_resolve).deb" $STD curl -fsSL -o /tmp/wkhtmltox.deb "$WKHTMLTOPDF_URL" $STD apt install -y /tmp/wkhtmltox.deb rm -f /tmp/wkhtmltox.deb diff --git a/install/ersatztv-install.sh b/install/ersatztv-install.sh index 8cafffea5..2238a3f83 100644 --- a/install/ersatztv-install.sh +++ b/install/ersatztv-install.sh @@ -14,8 +14,8 @@ network_check update_os setup_hwaccel -fetch_and_deploy_gh_release "ersatztv" "ErsatzTV/ErsatzTV" "prebuild" "latest" "/opt/ErsatzTV" "*linux-$(get_arch_value "x64" "arm64").tar.gz" -fetch_and_deploy_gh_release "ersatztv-ffmpeg" "ErsatzTV/ErsatzTV-ffmpeg" "prebuild" "latest" "/opt/ErsatzTV-ffmpeg" "*-$(get_arch_value "linux64" "linuxarm64")-gpl-7.1.tar.xz" +fetch_and_deploy_gh_release "ersatztv" "ErsatzTV/ErsatzTV" "prebuild" "latest" "/opt/ErsatzTV" "*linux-$(arch_resolve "x64" "arm64").tar.gz" +fetch_and_deploy_gh_release "ersatztv-ffmpeg" "ErsatzTV/ErsatzTV-ffmpeg" "prebuild" "latest" "/opt/ErsatzTV-ffmpeg" "*-$(arch_resolve "linux64" "linuxarm64")-gpl-7.1.tar.xz" msg_info "Set ErsatzTV-ffmpeg links" chmod +x /opt/ErsatzTV-ffmpeg/bin/* diff --git a/install/ezbookkeeping-install.sh b/install/ezbookkeeping-install.sh index ceb6365f0..f34ecbdc4 100644 --- a/install/ezbookkeeping-install.sh +++ b/install/ezbookkeeping-install.sh @@ -13,7 +13,7 @@ setting_up_container network_check update_os -fetch_and_deploy_gh_release "ezbookkeeping" "mayswind/ezbookkeeping" "prebuild" "latest" "/opt/ezbookkeeping" "ezbookkeeping-*-linux-$(get_arch_value).tar.gz" +fetch_and_deploy_gh_release "ezbookkeeping" "mayswind/ezbookkeeping" "prebuild" "latest" "/opt/ezbookkeeping" "ezbookkeeping-*-linux-$(arch_resolve).tar.gz" create_self_signed_cert msg_info "Configuring ezBookkeeping" diff --git a/install/fileflows-install.sh b/install/fileflows-install.sh index e826d0eb6..af93424b6 100644 --- a/install/fileflows-install.sh +++ b/install/fileflows-install.sh @@ -23,7 +23,7 @@ msg_ok "Installed Dependencies" setup_hwaccel msg_info "Installing ASP.NET Core Runtime" -if [[ "$(get_arch_value)" == "arm64" ]]; then +if [[ "$(arch_resolve)" == "arm64" ]]; then # packages.microsoft.com only ships amd64 debs for Debian; use dotnet-install on arm64 curl -fsSL https://dot.net/v1/dotnet-install.sh -o /tmp/dotnet-install.sh $STD bash /tmp/dotnet-install.sh --channel 8.0 --runtime aspnetcore --install-dir /usr/lib/dotnet8 diff --git a/install/forgejo-install.sh b/install/forgejo-install.sh index 6043077ad..38fa16813 100644 --- a/install/forgejo-install.sh +++ b/install/forgejo-install.sh @@ -19,7 +19,7 @@ $STD apt install -y \ git-lfs msg_ok "Installed Dependencies" -fetch_and_deploy_codeberg_release "forgejo" "forgejo/forgejo" "singlefile" "latest" "/opt/forgejo" "forgejo-*-linux-$(get_arch_value)" +fetch_and_deploy_codeberg_release "forgejo" "forgejo/forgejo" "singlefile" "latest" "/opt/forgejo" "forgejo-*-linux-$(arch_resolve)" ln -sf /opt/forgejo/forgejo /usr/local/bin/forgejo msg_info "Setting up Forgejo" diff --git a/install/frigate-install.sh b/install/frigate-install.sh index 192cac0bd..c4113ebaf 100644 --- a/install/frigate-install.sh +++ b/install/frigate-install.sh @@ -91,7 +91,7 @@ msg_ok "Installed Dependencies" setup_hwaccel -export TARGETARCH="$(get_arch_value)" +export TARGETARCH="$(arch_resolve)" export CCACHE_DIR=/root/.ccache export CCACHE_MAXSIZE=2G export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn @@ -122,7 +122,7 @@ msg_info "Building SQLite Extensions" $STD bash /opt/frigate/docker/main/build_sqlite_vec.sh msg_ok "Built SQLite Extensions" -fetch_and_deploy_gh_release "go2rtc" "AlexxIT/go2rtc" "singlefile" "latest" "/usr/local/go2rtc/bin" "go2rtc_linux_$(get_arch_value)" +fetch_and_deploy_gh_release "go2rtc" "AlexxIT/go2rtc" "singlefile" "latest" "/usr/local/go2rtc/bin" "go2rtc_linux_$(arch_resolve)" msg_info "Installing Tempio" sed -i 's|/rootfs/usr/local|/usr/local|g' /opt/frigate/docker/main/install_tempio.sh diff --git a/misc/core.func b/misc/core.func index 96bf9c5dd..6e9e590e0 100644 --- a/misc/core.func +++ b/misc/core.func @@ -361,13 +361,13 @@ arch_check() { } # ------------------------------------------------------------------------------ -# get_arch_value() +# arch_resolve() # # - Selects an architecture-specific value while preserving amd64 defaults -# - Usage: get_arch_value "amd64-value" "arm64-value" +# - Usage: arch_resolve "amd64-value" "arm64-value" # - Defaults: amd64="amd64", arm64="arm64" # ------------------------------------------------------------------------------ -get_arch_value() { +arch_resolve() { local amd64_val="${1:-amd64}" local arm64_val="${2:-arm64}" local arch="${PCT_ARCH:-$(dpkg --print-architecture 2>/dev/null || uname -m)}"