From 106b2e42c0d838a5fa04acd35a2e7125142a072d Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Wed, 6 Nov 2024 12:59:27 -0500
Subject: [PATCH] feat: nodejs issues with version 2

---
 .github/workflows/main.yml                    | 7 ++-----
 plugin/source/dynamix.unraid.net/pkg_build.sh | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 08a2dc303..eb00b59f8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -163,7 +163,8 @@ jobs:
         with:
           name: unraid-web
           path: ./plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components
-      - name: Download Node.js From Slackbuilds
+      - name: Download Node.js From Slackbuilds (skipped due to node.js issues)
+        if: false
         id: download-nodejs
         run: |
           # Get latest node version (based on main_node_version) from slackware
@@ -202,15 +203,11 @@ jobs:
           export API_VERSION=${{needs.build-test-api.outputs.API_VERSION}}
           export API_MD5=${{needs.build-test-api.outputs.API_MD5}}
           export API_SHA256=${{needs.build-test-api.outputs.API_SHA256}}
-          export NODEJS_FILENAME=${{ steps.download-nodejs.outputs.NODEJS_FILENAME }}
-          export NODEJS_SHA256=${{ steps.download-nodejs.outputs.NODEJS_SHA256 }}
           export NGHTTP3_FILENAME=${{ steps.download-nghttp3.outputs.NGHTTP3_FILENAME }}
           export NGHTTP3_SHA256=${{ steps.download-nghttp3.outputs.NGHTTP3_SHA256 }}
           if [ -z "${API_VERSION}" ] || 
             [ -z "${API_MD5}" ] || 
             [ -z "${API_SHA256}" ] || 
-            [ -z "${NODEJS_FILENAME}" ] || 
-            [ -z "${NODEJS_SHA256}" ] || 
             [ -z "${NGHTTP3_FILENAME}" ] || 
             [ -z "${NGHTTP3_SHA256}" ]; then
             echo "Error: One or more required variables are not set."
diff --git a/plugin/source/dynamix.unraid.net/pkg_build.sh b/plugin/source/dynamix.unraid.net/pkg_build.sh
index 2df047ed2..be80a9aeb 100755
--- a/plugin/source/dynamix.unraid.net/pkg_build.sh
+++ b/plugin/source/dynamix.unraid.net/pkg_build.sh
@@ -51,24 +51,24 @@ cd "${DIR}" || exit 1
 PLUGIN_URL="https://stable.dl.unraid.net/unraid-api/\&name;.plg"
 MAIN_TXZ="https://stable.dl.unraid.net/unraid-api/${plugin}-${version}.txz"
 API_TGZ="https://stable.dl.unraid.net/unraid-api/unraid-api-${API_VERSION}.tgz"
-NODEJS_TXZ="https://stable.dl.unraid.net/unraid-api/${NODEJS_FILENAME}"
 NGHTTP3_TXZ="https://stable.dl.unraid.net/unraid-api/${NGHTTP3_FILENAME}"
 # Check if PR is set, use a different path if so
 if [[ -n "${PR}" ]]; then
   MAIN_TXZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${plugin}-${version}.txz"
   API_TGZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/unraid-api-${API_VERSION}.tgz"
   PLUGIN_URL="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${plugin}.plg"
-  NODEJS_TXZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${NODEJS_FILENAME}"
   NGHTTP3_TXZ="https://preview.dl.unraid.net/unraid-api/pr/${PR}/${NGHTTP3_FILENAME}"
 elif [[ "${env}" == "staging" ]]; then
   PLUGIN_URL="https://preview.dl.unraid.net/unraid-api/\&name;.plg"
   MAIN_TXZ="https://preview.dl.unraid.net/unraid-api/${plugin}-${version}.txz"
   API_TGZ="https://preview.dl.unraid.net/unraid-api/unraid-api-${API_VERSION}.tgz"
-  NODEJS_TXZ="https://preview.dl.unraid.net/unraid-api/${NODEJS_FILENAME}"
   NGHTTP3_TXZ="https://preview.dl.unraid.net/unraid-api/${NGHTTP3_FILENAME}"
 fi
 
-
+# Hardcoded to deal with the new -2 release breaking legacy Unraid versions
+NODEJS_FILENAME="nodejs-20.18.0-x86_64-1.txz"
+NODEJS_TXZ="https://stable.dl.unraid.net/unraid-api/dependencies/${NODEJS_FILENAME}"
+NODEJS_SHA256="332f22a2a6722e9fad92b8d1eeaded228a6499b7335b2b54ee99c55b4fe49742"
 
 # update plg file
 sed -i -E "s#(ENTITY name\s*)\".*\"#\1\"${plugin}\"#g" "${plgfile}"