Update matterbridge.sh

tweak

ct/matterbridge.sh

@@ -54,37 +54,8 @@ function default_settings() {
 
 function update_script() {
 header_info
-if [[ ! -d /opt/matterbridge ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
-
-RELEASE=$(curl -s https://api.github.com/repos/Luligu/matterbridge/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}')
-if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
-  msg_info "Stopping ${APP} Service"
-  systemctl stop matterbridge
-  msg_ok "Stopped ${APP} Service"
-
-  msg_info "Updating ${APP} to ${RELEASE}"
-  cd /opt/matterbridge
-  wget -q "https://github.com/Luligu/matterbridge/archive/refs/tags/${RELEASE}.zip" 
-  unzip -q ${RELEASE}.zip
-  mv matterbridge-${RELEASE} /opt/matterbridge
-  cd /opt/matterbridge
-  npm ci >/dev/null 2>&1
-  npm run build >/dev/null 2>&1
-  echo "${RELEASE}" >/opt/${APP}_version.txt
-  msg_ok "Updated ${APP} to ${RELEASE}"
-
-  msg_info "Cleaning up"
-  rm /opt/${RELEASE}.zip 
-  msg_ok "Cleaned"
-
-  msg_info "Starting ${APP} Service"
-  systemctl start matterbridge
-  sleep 1
-  msg_ok "Started ${APP} Service"
-  msg_ok "Updated Successfully!\n"
-else
-  msg_ok "No update required. ${APP} is already at ${RELEASE}"
-fi
+if [[ ! -d /root/Matterbridge ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
+msg_error "Update via the Matterbridge UI"
 exit
 }
 

install/frigate-install.sh

@@ -171,7 +171,6 @@ msg_ok "Installed Coral Object Detection Model"
 
 msg_info "Building Nginx with Custom Modules"
 $STD /opt/frigate/docker/main/build_nginx.sh
-#sed -i 's/exec nginx/exec \/usr\/local\/nginx\/sbin\/nginx/g' /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
 sed -e '/s6-notifyoncheck/ s/^#*/#/' -i /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
 sed -i 's/error_log \/dev\/stdout warn\;/error_log \/dev\/shm\/logs\/nginx\/current warn\;/' /usr/local/nginx/conf/nginx.conf
 sed -i 's/access_log \/dev\/stdout main\;/access_log \/dev\/shm\/logs\/nginx\/current main\;/' /usr/local/nginx/conf/nginx.conf
@@ -212,7 +211,6 @@ RestartSec=1
 User=root
 ExecStartPre=+rm /dev/shm/logs/go2rtc/current
 ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run
-#ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '"
 StandardOutput=file:/dev/shm/logs/go2rtc/current
 StandardError=file:/dev/shm/logs/go2rtc/current
 
@@ -235,7 +233,6 @@ RestartSec=1
 User=root
 ExecStartPre=+rm /dev/shm/logs/frigate/current
 ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run
-#ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '"
 StandardOutput=file:/dev/shm/logs/frigate/current
 StandardError=file:/dev/shm/logs/frigate/current
 
@@ -257,8 +254,7 @@ Restart=always
 RestartSec=1
 User=root
 ExecStartPre=+rm /dev/shm/logs/nginx/current
-#ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
-ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '"
+ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
 StandardOutput=file:/dev/shm/logs/nginx/current
 StandardError=file:/dev/shm/logs/nginx/current
 

install/matterbridge-install.sh

@@ -15,17 +15,11 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y --no-install-recommends \
-  build-essential \
-  unzip \
-  curl \
-  sudo \
-  git \
-  make \
-  gnupg \
-  ca-certificates \
-  mc
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y gpg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Node.js Repository"
@@ -40,15 +34,8 @@ $STD apt-get install -y nodejs
 msg_ok "Installed Node.js"
 
 msg_info "Install Matterbridge" 
-RELEASE=$(curl -s https://api.github.com/repos/Luligu/matterbridge/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-wget -q "https://github.com/Luligu/matterbridge/archive/refs/tags/${RELEASE}.zip"
-unzip -q ${RELEASE}.zip
-mv matterbridge-${RELEASE} /opt/matterbridge
-rm -R ${RELEASE}.zip 
-cd /opt/matterbridge
-$STD npm ci
-$STD npm run build
-echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
+mkdir -p /root/Matterbridge
+$STD npm install -g matterbridge
 msg_ok "Installed Matterbridge"
 
 msg_info "Creating Service"
@@ -59,16 +46,13 @@ After=network-online.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/npm run start:bridge
-WorkingDirectory=/opt/matterbridge
+ExecStart=matterbridge -bridge -service
+WorkingDirectory=/root/Matterbridge
 StandardOutput=inherit
 StandardError=inherit
 Restart=always
 RestartSec=10s
 TimeoutStopSec=30s
-User=root
-Environment=PATH=/usr/bin:/usr/local/bin:/opt/matterbridge/bin
-Environment=NODE_ENV=production
 
 [Install]
 WantedBy=multi-user.target