From ce628645471854518e7df2f84903af1f643ce00d Mon Sep 17 00:00:00 2001 From: ebaauw Date: Thu, 20 Jul 2023 18:48:07 +0200 Subject: [PATCH 1/2] Update source.sh - Fix `hb-service` not working from Homebridge UI when using Synology Node.JS-v18 package. - Revert to bundled NodeJS version, when removing Node.JS-v18 package. --- app/source.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/source.sh b/app/source.sh index 58b2f00..f505b31 100755 --- a/app/source.sh +++ b/app/source.sh @@ -1,17 +1,15 @@ #!/bin/sh - - export HB_SERVICE_STORAGE_PATH="$(readlink -f /var/packages/homebridge/shares/homebridge)" +NODE_BIN_PATH="/var/packages/homebridge/target/app/bin" # Use Synology supplied NodeJS v18 - https://github.com/homebridge/homebridge-syno-spk/issues/124 -# if [ -f /var/packages/Node.js_v18/target/usr/local/bin/node ]; then -NODE_BIN_PATH="/var/packages/Node.js_v18/target/usr/local/bin" -export HB_SERVICE_NODE_EXEC_PATH="/var/packages/Node.js_v18/target/usr/local/bin/node" -# else -# NODE_BIN_PATH="/var/packages/homebridge/target/app/bin" -# export HB_SERVICE_NODE_EXEC_PATH="/var/packages/homebridge/target/app/bin/node" -#fi +if [ -f /var/packages/Node.js_v18/target/usr/local/bin/node ]; then + NODE_BIN_PATH="/var/packages/Node.js_v18/target/usr/local/bin:$NODE_BIN_PATH" + export HB_SERVICE_NODE_EXEC_PATH="/var/packages/Node.js_v18/target/usr/local/bin/node" +else + export HB_SERVICE_NODE_EXEC_PATH="/var/packages/homebridge/target/app/bin/node" +fi export HB_SERVICE_EXEC_PATH="/var/packages/homebridge/target/app/lib/node_modules/homebridge-config-ui-x/dist/bin/hb-service.js" From 8f9efa6bad73a006ec1168b2773941f634b0f544 Mon Sep 17 00:00:00 2001 From: ebaauw Date: Thu, 20 Jul 2023 18:51:56 +0200 Subject: [PATCH 2/2] Revert "Update source.sh" This reverts commit ce628645471854518e7df2f84903af1f643ce00d. --- app/source.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/source.sh b/app/source.sh index f505b31..58b2f00 100755 --- a/app/source.sh +++ b/app/source.sh @@ -1,15 +1,17 @@ #!/bin/sh + + export HB_SERVICE_STORAGE_PATH="$(readlink -f /var/packages/homebridge/shares/homebridge)" -NODE_BIN_PATH="/var/packages/homebridge/target/app/bin" # Use Synology supplied NodeJS v18 - https://github.com/homebridge/homebridge-syno-spk/issues/124 -if [ -f /var/packages/Node.js_v18/target/usr/local/bin/node ]; then - NODE_BIN_PATH="/var/packages/Node.js_v18/target/usr/local/bin:$NODE_BIN_PATH" - export HB_SERVICE_NODE_EXEC_PATH="/var/packages/Node.js_v18/target/usr/local/bin/node" -else - export HB_SERVICE_NODE_EXEC_PATH="/var/packages/homebridge/target/app/bin/node" -fi +# if [ -f /var/packages/Node.js_v18/target/usr/local/bin/node ]; then +NODE_BIN_PATH="/var/packages/Node.js_v18/target/usr/local/bin" +export HB_SERVICE_NODE_EXEC_PATH="/var/packages/Node.js_v18/target/usr/local/bin/node" +# else +# NODE_BIN_PATH="/var/packages/homebridge/target/app/bin" +# export HB_SERVICE_NODE_EXEC_PATH="/var/packages/homebridge/target/app/bin/node" +#fi export HB_SERVICE_EXEC_PATH="/var/packages/homebridge/target/app/lib/node_modules/homebridge-config-ui-x/dist/bin/hb-service.js"