Merge branch 'main-upstream'

install/frigate-install.sh

@@ -45,6 +45,7 @@ if [[ "$CTTYPE" == "0" ]]; then
   chmod 660 /dev/dri/*
 fi
 msg_ok "Set Up Hardware Acceleration"
+
 RELEASE=$(curl -s https://api.github.com/repos/blakeblackshear/frigate/releases/latest | jq -r '.tag_name')
 msg_ok "Stop spinner to prevent segmentation fault"
 msg_info "Installing Frigate $RELEASE (Perseverance)"
@@ -155,7 +156,10 @@ cd /
 wget -qO edgetpu_model.tflite https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess_edgetpu.tflite
 wget -qO cpu_model.tflite https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess.tflite
 cp /opt/frigate/labelmap.txt /labelmap.txt
-wget -qO cpu_audio_model.tflite https://tfhub.dev/google/lite-model/yamnet/classification/tflite/1?lite-format=tflite
+wget -qO yamnet-tflite-classification-tflite-v1.tar.gz https://www.kaggle.com/api/v1/models/google/yamnet/tfLite/classification-tflite/1/download
+tar xzf yamnet-tflite-classification-tflite-v1.tar.gz
+rm -rf yamnet-tflite-classification-tflite-v1.tar.gz
+mv 1.tflite cpu_audio_model.tflite
 cp /opt/frigate/audio-labelmap.txt /audio-labelmap.txt
 mkdir -p /media/frigate
 wget -qO /media/frigate/person-bicycle-car-detection.mp4 https://github.com/intel-iot-devkit/sample-videos/raw/master/person-bicycle-car-detection.mp4

install/influxdb-install.sh

@@ -25,9 +25,8 @@ $STD apt-get install -y openssh-server
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up InfluxDB Repository"
-wget -q https://repos.influxdata.com/influxdata-archive_compat.key
-cat influxdata-archive_compat.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null
-sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main" > /etc/apt/sources.list.d/influxdata.list'
+wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | gpg --dearmor > /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg
+echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main" > /etc/apt/sources.list.d/influxdata.list
 msg_ok "Set up InfluxDB Repository"
 
 read -r -p "Which version of InfluxDB to install? (1 or 2) " prompt

install/octoprint-install.sh

@@ -32,6 +32,7 @@ $STD apt-get install -y \
   python3-venv
 
 $STD apt-get install -y python3-setuptools
+rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
 msg_ok "Updated Python3"
 
 msg_info "Creating user octoprint"

install/sabnzbd-install.sh

@@ -31,7 +31,6 @@ msg_ok "Installed Dependencies"
 
 msg_info "Updating Python3"
 $STD apt-get install -y \
-  python3 \
   python3-dev \
   python3-pip
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED

install/scrutiny-install.sh

@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2024 tteck
-# Author: tteck
-# Co-Author: MickLesk (Canbiz)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-# Source: https://github.com/AnalogJ/scrutiny
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  sudo \
-  curl \
-  smartmontools  \
-  make \
-  mc \
-  wget \
-  openssh-server \
-  lsb-base \
-  lsb-release \
-  gnupg2
-msg_ok "Installed Dependencies"
-
-msg_info "Setting up InfluxDB Repository"
-wget -q https://repos.influxdata.com/influxdata-archive_compat.key
-cat influxdata-archive_compat.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null
-sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main" > /etc/apt/sources.list.d/influxdata.list'
-msg_ok "Set up InfluxDB Repository"
-
-msg_info "Installing InfluxDB"
-$STD apt-get update
-$STD apt-get install -y influxdb2
-$STD systemctl enable --now influxdb
-msg_ok "Installed InfluxDB"
-
-msg_info "Installing Scrutiny WebApp"
-mkdir -p /opt/scrutiny/{config,web,bin}
-RELEASE=$(curl -s https://api.github.com/repos/analogj/scrutiny/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
-wget -q -O /opt/scrutiny/config/scrutiny.yaml https://raw.githubusercontent.com/AnalogJ/scrutiny/master/example.scrutiny.yaml
-wget -q -O /opt/scrutiny/bin/scrutiny-web-linux-arm64 "https://github.com/AnalogJ/scrutiny/releases/download/${RELEASE}/scrutiny-web-linux-arm64"
-wget -q -O /opt/scrutiny/web/scrutiny-web-frontend.tar.gz "https://github.com/AnalogJ/scrutiny/releases/download/${RELEASE}/scrutiny-web-frontend.tar.gz"
-cd /opt/scrutiny/web 
-tar xzf scrutiny-web-frontend.tar.gz --strip-components 1 -C .
-chmod +x /opt/scrutiny/bin/scrutiny-web-linux-arm64
-msg_ok "Installed Scrutiny WebApp"
-
-msg_info "Setup Service" 
-cat <<EOF >/etc/systemd/system/scrutiny.service
-[Unit]
-Description=Scrutiny - Hard Drive Monitoring and Webapp
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/opt/scrutiny/bin/scrutiny-web-linux-arm64 start --config /opt/scrutiny/config/scrutiny.yaml
-Restart=always
-User=root
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now scrutiny.service
-msg_ok "Created and enabled Service"
-
-motd_ssh
-customize
-
-msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
-msg_ok "Cleaned"

install/tautulli-install.sh

@@ -34,7 +34,7 @@ msg_ok "Updated Python3"
 msg_info "Installing Tautulli"
 cd /opt
 $STD git clone https://github.com/Tautulli/Tautulli.git
-python3 -m pip install -q -r /opt/Tautulli/requirements.txt
+$STD pip install -q -r /opt/Tautulli/requirements.txt
 $STD pip install pyopenssl
 msg_ok "Installed Tautulli"