From 47fc14acd6d9737e20023821af3ebf478427f05a Mon Sep 17 00:00:00 2001 From: Tom Frenzel Date: Wed, 20 May 2026 15:56:13 +0200 Subject: [PATCH] fix(matterjs-server): use local install --- ct/matterjs-server.sh | 36 +++++++++++++++--------------- install/matterjs-server-install.sh | 6 +++-- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/ct/matterjs-server.sh b/ct/matterjs-server.sh index 060427f1..f98488ef 100644 --- a/ct/matterjs-server.sh +++ b/ct/matterjs-server.sh @@ -24,30 +24,30 @@ function update_script() { check_container_storage check_container_resources - if [[ ! -f /usr/local/bin/matter-server ]]; then + if [[ ! -d /opt/matter-server ]]; then msg_error "No ${APP} Installation Found!" exit fi - CURRENT=$(npm list -g matter-server --depth=0 2>/dev/null | grep matter-server | sed 's/.*@//') - LATEST=$(npm show matter-server version 2>/dev/null) - if [[ "$CURRENT" == "$LATEST" ]]; then + CURRENT=$(cat /opt/matter-server/node_modules/matter-server/package.json | grep '"version"' | head -1 | sed 's/.*"\([^"]*\)".*/\1/') + LATEST=$(npm view matter-server version 2>/dev/null) + if [[ "$CURRENT" != "$LATEST" ]]; then + msg_info "Stopping Service" + systemctl stop matterjs-server + msg_ok "Stopped Service" + + msg_info "Updating ${APP} from v${CURRENT} to v${LATEST}" + cd /opt/matter-server + $STD npm install matter-server@latest + msg_ok "Updated ${APP}" + + msg_info "Starting Service" + systemctl start matterjs-server + msg_ok "Started Service" + msg_ok "Updated successfully!" + else msg_ok "No update required. ${APP} is already at v${LATEST}" - exit fi - - msg_info "Stopping Service" - systemctl stop matterjs-server - msg_ok "Stopped Service" - - msg_info "Updating ${APP} to v${LATEST}" - $STD npm install -g matter-server - msg_ok "Updated ${APP} to v${LATEST}" - - msg_info "Starting Service" - systemctl start matterjs-server - msg_ok "Started Service" - msg_ok "Updated successfully!" exit } diff --git a/install/matterjs-server-install.sh b/install/matterjs-server-install.sh index 99045ac8..c5ab7fad 100644 --- a/install/matterjs-server-install.sh +++ b/install/matterjs-server-install.sh @@ -16,7 +16,9 @@ update_os NODE_VERSION="22" setup_nodejs msg_info "Installing MatterJS-Server" -$STD npm install -g matter-server +mkdir -p /opt/matter-server +cd /opt/matter-server +$STD npm install matter-server mkdir -p /var/lib/matterjs-server msg_ok "Installed MatterJS-Server" @@ -29,7 +31,7 @@ After=network.target [Service] Type=simple User=root -ExecStart=/usr/local/bin/matter-server --storage-path /var/lib/matterjs-server +ExecStart=/usr/bin/node /opt/matter-server/node_modules/matter-server/dist/esm/MatterServer.js --storage-path /var/lib/matterjs-server Restart=on-failure RestartSec=5