From 16cff16207793bedeb6c8f5d68f6b2f1299a15c8 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Sat, 18 Oct 2025 12:01:46 +0200 Subject: [PATCH] var. bugfixes --- ct/nginxproxymanager.sh | 18 +++++++++--------- install/nginxproxymanager-install.sh | 11 ++++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 7607e0c8..06709212 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -28,13 +28,14 @@ function update_script() { exit fi - if ! command -v pnpm &>/dev/null; then - msg_info "Installing pnpm" - #export NODE_OPTIONS=--openssl-legacy-provider - $STD npm install -g pnpm@8.15 - msg_ok "Installed pnpm" + if ! command -v yarn &>/dev/null; then + msg_info "Installing Yarn" + $STD npm install -g yarn + msg_ok "Installed Yarn" fi + export NODE_OPTIONS="--openssl-legacy-provider" + RELEASE=$(curl -fsSL https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') @@ -49,9 +50,8 @@ function update_script() { sed -i "s|\"version\": \"0.0.0\"|\"version\": \"$RELEASE\"|" backend/package.json sed -i "s|\"version\": \"0.0.0\"|\"version\": \"$RELEASE\"|" frontend/package.json cd ./frontend || exit - $STD pnpm install - $STD pnpm upgrade - $STD pnpm run build + $STD yarn install --network-timeout 600000 + $STD yarn build ) msg_ok "Built Frontend" @@ -134,7 +134,7 @@ function update_script() { EOF fi cd /app || exit - $STD pnpm install + $STD yarn install --network-timeout 600000 msg_ok "Initialized Backend" msg_info "Starting Services" diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 94a1d6d5..fc766236 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -50,7 +50,7 @@ $STD apt update $STD apt -y install openresty msg_ok "Installed Openresty" -NODE_VERSION="20" NODE_MODULE="pnpm@latest" setup_nodejs +NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs RELEASE=$(curl -fsSL https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest | grep "tag_name" | @@ -115,9 +115,9 @@ msg_ok "Set up Environment" msg_info "Building Frontend" cd ./frontend -$STD pnpm install -$STD pnpm upgrade -$STD pnpm run build +export NODE_OPTIONS="--openssl-legacy-provider" +$STD yarn install --network-timeout 600000 +$STD yarn build cp -r dist/* /app/frontend cp -r app-images/* /app/frontend/images msg_ok "Built Frontend" @@ -140,7 +140,8 @@ if [ ! -f /app/config/production.json ]; then EOF fi cd /app -$STD pnpm install +export NODE_OPTIONS="--openssl-legacy-provider" +$STD yarn install --network-timeout 600000 msg_ok "Initialized Backend" msg_info "Creating Service"