From 27c4cc7393986738fdc1fc2437748d5df475f10b Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Thu, 6 Oct 2022 14:49:34 +0200 Subject: [PATCH] CT, z2mqtt: zwavejs2mqtt was renamed to Z-wave JS UI --- CT-Build/Alpine.yaml | 2 +- CT-Files/z2mqtt/Scripts/Init.sh | 12 ++++++------ CT-Files/z2mqtt/Scripts/PTKAppUpdate.sh | 2 +- .../{Update-Zwave2mqtt.sh => Update-ZwaveJsUi.sh} | 6 +++--- Readme.md | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) rename CT-Files/z2mqtt/Scripts/{Update-Zwave2mqtt.sh => Update-ZwaveJsUi.sh} (58%) diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index 554dcd3..c3554ab 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -305,7 +305,7 @@ files: variants: - transfersh -#FileForZigbee2mqtt&Zwavejs2mqtt +#FileForZigbee2mqtt&ZWaveJsUi - path: /opt/Setup generator: copy source: CT-Files/z2mqtt diff --git a/CT-Files/z2mqtt/Scripts/Init.sh b/CT-Files/z2mqtt/Scripts/Init.sh index e896d22..63a7999 100644 --- a/CT-Files/z2mqtt/Scripts/Init.sh +++ b/CT-Files/z2mqtt/Scripts/Init.sh @@ -11,21 +11,21 @@ npm --prefix /opt/node/zigbee2mqtt ci sed -i -e '/port:/c\ port: \/dev\/ttyACM-Zigbee' /opt/node/zigbee2mqtt/data/configuration.yaml printf "frontend:\n port: 5002" >> /opt/node/zigbee2mqtt/data/configuration.yaml -#Install zwavejs2mqtt -git clone https://github.com/zwave-js/zwavejs2mqtt /opt/node/zwavejs2mqtt -(cd /opt/node/zwavejs2mqtt; yarn install) -yarn --cwd /opt/node/zwavejs2mqtt run build +#Install Z-Wave JS UI +git clone https://github.com/zwave-js/zwave-js-ui /opt/node/ZwaveJsUi +(cd /opt/node/ZwaveJsUi; yarn install) +yarn --cwd /opt/node/ZwaveJsUi run build #Save PM2 statup config pm2 start npm --name zigbee2mqtt --cwd /opt/node/zigbee2mqtt -- start -pm2 start yarn --name zwavejs2mqtt --cwd /opt/node/zwavejs2mqtt -- start +pm2 start yarn --name ZwaveJsUi --cwd /opt/node/ZwaveJsUi -- start pm2 save pm2 kill EOF #Adding update scipts mv /opt/Setup/Scripts/Update-Zigbee2Mqtt.sh /opt/Update-Zigbee2Mqtt.sh -mv /opt/Setup/Scripts/Update-Zwave2mqtt.sh /opt/Update-Zwave2Mqtt.sh +mv /opt/Setup/Scripts/Update-ZwaveJsUi.sh /opt/Update-ZwaveJsUi.sh #Cleanup rm -rf /home/node/.npm/_cacache diff --git a/CT-Files/z2mqtt/Scripts/PTKAppUpdate.sh b/CT-Files/z2mqtt/Scripts/PTKAppUpdate.sh index 71ab6b6..d611ca7 100644 --- a/CT-Files/z2mqtt/Scripts/PTKAppUpdate.sh +++ b/CT-Files/z2mqtt/Scripts/PTKAppUpdate.sh @@ -1,4 +1,4 @@ #!/bin/sh # Update script for updating apps with ProxmoxHelper/ProxMoxToolKit ash /opt/Update-Zigbee2Mqtt.sh -ash /opt/Update-Zwave2Mqtt.sh \ No newline at end of file +ash /opt/Update-ZwaveJsUi.sh \ No newline at end of file diff --git a/CT-Files/z2mqtt/Scripts/Update-Zwave2mqtt.sh b/CT-Files/z2mqtt/Scripts/Update-ZwaveJsUi.sh similarity index 58% rename from CT-Files/z2mqtt/Scripts/Update-Zwave2mqtt.sh rename to CT-Files/z2mqtt/Scripts/Update-ZwaveJsUi.sh index ca97ca7..23a6268 100644 --- a/CT-Files/z2mqtt/Scripts/Update-Zwave2mqtt.sh +++ b/CT-Files/z2mqtt/Scripts/Update-ZwaveJsUi.sh @@ -2,10 +2,10 @@ #Run folowing commands as 'node' user sudo -u node ash << EOF -/usr/local/bin/pm2 stop zwavejs2mqtt -cd /opt/node/zwavejs2mqtt +/usr/local/bin/pm2 stop ZwaveJsUi +cd /opt/node/ZwaveJsUi git pull /usr/local/bin/yarn install /usr/local/bin/yarn run build -/usr/local/bin/pm2 start zwavejs2mqtt +/usr/local/bin/pm2 start ZwaveJsUi EOF \ No newline at end of file diff --git a/Readme.md b/Readme.md index 95414a6..1fba6c9 100644 --- a/Readme.md +++ b/Readme.md @@ -196,8 +196,8 @@ lxc.mount.entry: /dev/ttyACM-Zigbee dev/ttyACM-Zigbee none bind,optional,create= lxc.mount.entry: /dev/ttyACM-Zwave dev/ttyACM-Zwave none bind,optional,create=file ``` * Zigbee2mqtt Available on http://``:5002 -* ZWave2mqtt Available on http://``:8091 -* in the ZWave2mqtt web ui set the Zwave serial port to /dev/ttyACM-Zwave +* Z-wave JS UI Available on http://``:8091 +* in the Z-wave JS UI web ui set the Zwave serial port to /dev/ttyACM-Zwave * If a `Cannot lock port` error shows, please reboot the CT, if that does not fix it try rebooting the Proxmox server ## nodered