diff --git a/ct/sparkyfitness.sh b/ct/sparkyfitness.sh index 4bd1f984f..5ef6c7609 100644 --- a/ct/sparkyfitness.sh +++ b/ct/sparkyfitness.sh @@ -29,8 +29,6 @@ function update_script() { exit fi - NODE_VERSION="25" setup_nodejs - if check_for_gh_release "sparkyfitness" "CodeWithCJ/SparkyFitness"; then msg_info "Stopping Services" systemctl stop sparkyfitness-server nginx @@ -48,6 +46,9 @@ function update_script() { CLEAN_INSTALL=1 fetch_and_deploy_gh_release "sparkyfitness" "CodeWithCJ/SparkyFitness" "tarball" + PNPM_VERSION="$(jq -r '.packageManager | split("@")[1]' /opt/sparkyfitness/package.json)" + NODE_VERSION="25" NODE_MODULE="pnpm@${PNPM_VERSION}" setup_nodejs + msg_info "Updating Sparky Fitness Backend" cd /opt/sparkyfitness/SparkyFitnessServer $STD npm install @@ -55,8 +56,8 @@ function update_script() { msg_info "Updating Sparky Fitness Frontend (Patience)" cd /opt/sparkyfitness/SparkyFitnessFrontend - $STD npm install - $STD npm run build + $STD pnpm install + $STD pnpm run build cp -a /opt/sparkyfitness/SparkyFitnessFrontend/dist/. /var/www/sparkyfitness/ msg_ok "Updated Sparky Fitness Frontend" diff --git a/install/sparkyfitness-install.sh b/install/sparkyfitness-install.sh index 94aa4b025..f7bad8760 100644 --- a/install/sparkyfitness-install.sh +++ b/install/sparkyfitness-install.sh @@ -17,12 +17,14 @@ msg_info "Installing Dependencies" $STD apt install -y nginx msg_ok "Installed Dependencies" -NODE_VERSION="25" setup_nodejs PG_VERSION="18" setup_postgresql PG_DB_NAME="sparkyfitness" PG_DB_USER="sparky" PG_DB_GRANT_SUPERUSER="true" setup_postgresql_db fetch_and_deploy_gh_release sparkyfitness "CodeWithCJ/SparkyFitness" "tarball" "latest" +PNPM_VERSION="$(jq -r '.packageManager | split("@")[1]' /opt/sparkyfitness/package.json)" +NODE_VERSION="25" NODE_MODULE="pnpm@${PNPM_VERSION}" setup_nodejs + msg_info "Configuring Sparky Fitness" mkdir -p "/etc/sparkyfitness" "/var/lib/sparkyfitness/uploads" "/var/lib/sparkyfitness/backup" "/var/www/sparkyfitness" cp "/opt/sparkyfitness/docker/.env.example" "/etc/sparkyfitness/.env" @@ -50,8 +52,8 @@ msg_ok "Built Backend" msg_info "Building Frontend (Patience)" cd /opt/sparkyfitness/SparkyFitnessFrontend -$STD npm install -$STD npm run build +$STD pnpm install +$STD pnpm run build cp -a /opt/sparkyfitness/SparkyFitnessFrontend/dist/. /var/www/sparkyfitness/ msg_ok "Built Frontend"