From eb9bff22c3f84138f07823ecee5ca0a2eec0b469 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Fri, 28 Jun 2024 10:25:08 +1000 Subject: [PATCH 01/11] Fix Scrutiny service start failure (#3278) --- install/scrutiny-install.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/install/scrutiny-install.sh b/install/scrutiny-install.sh index d155854bc..068ff84fa 100644 --- a/install/scrutiny-install.sh +++ b/install/scrutiny-install.sh @@ -21,9 +21,23 @@ $STD apt-get install -y \ curl \ smartmontools \ make \ - mc + mc \ + lsb-base \ + lsb-release \ + gnupg2 msg_ok "Installed Dependencies" +msg_info "Setting up InfluxDB Repository" +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" + +msg_info "Installing InfluxDB" +$STD apt-get update +$STD apt-get install -y influxdb2 +systemctl enable -q --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) }') From 2ec2831d5f89f856b3535140a49bb351b6c6b718 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 27 Jun 2024 20:32:13 -0400 Subject: [PATCH 02/11] Update influxdb-install.sh tweak --- install/influxdb-install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/install/influxdb-install.sh b/install/influxdb-install.sh index c43ba7fbe..a1edf8207 100644 --- a/install/influxdb-install.sh +++ b/install/influxdb-install.sh @@ -23,9 +23,8 @@ $STD apt-get install -y 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' +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 From 00f7e0b287dcb4622cde49af363d6031e734b1e3 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 27 Jun 2024 22:41:46 -0400 Subject: [PATCH 03/11] Update tautulli-install.sh tweak --- install/tautulli-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/tautulli-install.sh b/install/tautulli-install.sh index d431918df..23d7e4aa4 100644 --- a/install/tautulli-install.sh +++ b/install/tautulli-install.sh @@ -31,7 +31,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" From 9b42be526d4b3f89976fbe6ce95f275525c8f055 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 28 Jun 2024 06:56:20 -0400 Subject: [PATCH 04/11] Delete install/scrutiny-install.sh Does not function --- install/scrutiny-install.sh | 77 ------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 install/scrutiny-install.sh diff --git a/install/scrutiny-install.sh b/install/scrutiny-install.sh deleted file mode 100644 index 068ff84fa..000000000 --- a/install/scrutiny-install.sh +++ /dev/null @@ -1,77 +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 \ - lsb-base \ - lsb-release \ - gnupg2 -msg_ok "Installed Dependencies" - -msg_info "Setting up InfluxDB Repository" -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" - -msg_info "Installing InfluxDB" -$STD apt-get update -$STD apt-get install -y influxdb2 -systemctl enable -q --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-amd64 "https://github.com/AnalogJ/scrutiny/releases/download/${RELEASE}/scrutiny-web-linux-amd64" -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-amd64 -msg_ok "Installed Scrutiny WebApp" - -msg_info "Setup Service" -cat </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-amd64 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" From 946fad73b9856bff437daff50a7dc27cb5863666 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 28 Jun 2024 06:57:03 -0400 Subject: [PATCH 05/11] Delete ct/scrutiny.sh Does not function --- ct/scrutiny.sh | 190 ------------------------------------------------- 1 file changed, 190 deletions(-) delete mode 100644 ct/scrutiny.sh diff --git a/ct/scrutiny.sh b/ct/scrutiny.sh deleted file mode 100644 index 9b22fb8b7..000000000 --- a/ct/scrutiny.sh +++ /dev/null @@ -1,190 +0,0 @@ -#!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) -# Copyright (c) 2021-2024 tteck -# Author: tteck -# Co-Author: MickLesk (Canbiz) -# License: MIT -# https://github.com/tteck/Proxmox/raw/main/LICENSE - -function header_info { -clear -cat <<"EOF" - _____ __ _ - / ___/____________ __/ /_(_)___ __ __ - \__ \/ ___/ ___/ / / / __/ / __ \/ / / / - ___/ / /__/ / / /_/ / /_/ / / / / /_/ / -/____/\___/_/ \__,_/\__/_/_/ /_/\__, / - /____/ -EOF -} -header_info -echo -e "Loading..." -APP="Scrutiny" -var_disk="4" -var_cpu="1" -var_ram="1024" -var_os="debian" -var_version="12" -variables -color -catch_errors - -function default_settings() { - CT_TYPE="1" - PW="" - CT_ID=$NEXTID - HN=$NSAPP - DISK_SIZE="$var_disk" - CORE_COUNT="$var_cpu" - RAM_SIZE="$var_ram" - BRG="vmbr0" - NET="dhcp" - GATE="" - APT_CACHER="" - APT_CACHER_IP="" - DISABLEIP6="no" - MTU="" - SD="" - NS="" - MAC="" - VLAN="" - SSH="no" - VERB="no" - echo_default -} - -function update_script() { - if [[ ! -d /opt/scrutiny ]]; then msg_error "No ${APP} Installation Found!"; exit; fi - RELEASE=$(curl -s https://api.github.com/repos/AnalogJ/scrutiny/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') - - UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Scrutiny Management" --radiolist --cancel-button Exit-Script "Spacebar = Select" 15 70 4 \ - "1" "Update Scrutiny to $RELEASE" ON \ - "2" "Start Scrutiny Webapp" OFF \ - "3" "Create/Start Scrutiny Collector" OFF \ - "4" "Change Scrutiny Settings" OFF \ - 3>&1 1>&2 2>&3) - header_info - - if [ "$UPD" == "1" ]; then - if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then - - msg_info "Stopping all Scrutiny Services" - WEBAPP_ACTIVE=$(systemctl is-active scrutiny.service) - COLLECTOR_ACTIVE=$(systemctl is-active scrutiny_collector.service) - systemctl stop scrutiny.service scrutiny_collector.service - msg_ok "Stopped all Scrutiny Services" - - msg_info "Updating to ${RELEASE}" - cd /opt - rm -rf scrutiny_bak - mv scrutiny scrutiny_bak - mkdir -p /opt/scrutiny/web /opt/scrutiny/bin - wget -q -O /opt/scrutiny/bin/scrutiny-web-linux-amd64 "https://github.com/AnalogJ/scrutiny/releases/download/${RELEASE}/scrutiny-web-linux-amd64" - wget -q -O /opt/scrutiny/bin/scrutiny-collector-metrics-linux-amd64 "https://github.com/AnalogJ/scrutiny/releases/download/${RELEASE}/scrutiny-collector-metrics-linux-amd64" - 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 xvzf scrutiny-web-frontend.tar.gz --strip-components 1 -C . - chmod +x /opt/scrutiny/bin/scrutiny-web-linux-amd64 - chmod +x /opt/scrutiny/bin/scrutiny-collector-metrics-linux-amd64 - echo "${RELEASE}" > /opt/scrutiny_version.txt - msg_ok "Updated Scrutiny to $RELEASE" - - msg_info "Cleaning up" - rm -f /opt/scrutiny/web/scrutiny-web-frontend.tar.gz - msg_ok "Cleaned" - - if [ "$WEBAPP_ACTIVE" == "active" ]; then - msg_info "Starting Scrutiny Webapp Service" - systemctl start scrutiny.service - msg_ok "Started Scrutiny Webapp Service" - fi - - if [ "$COLLECTOR_ACTIVE" == "active" ]; then - msg_info "Starting Scrutiny Collector Service" - systemctl start scrutiny_collector.service - msg_ok "Started Scrutiny Collector Service" - fi - - msg_ok "Updated Successfully!\n" - else - msg_ok "No update required. ${APP} is already at ${RELEASE}" - fi - exit - fi -if [ "$UPD" == "2" ]; then - msg_info "Checking for Scrutiny Webapp Service" - if systemctl list-units --full -all | grep -Fq 'scrutiny.service'; then - msg_info "Stopping Scrutiny Webapp Service" - systemctl stop scrutiny.service - msg_ok "Stopped Scrutiny Webapp Service" - else - msg_info "Scrutiny Webapp Service not found, creating..." - cat </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-amd64 start --config /opt/scrutiny/config/scrutiny.yaml -Restart=always -User=root - -[Install] -WantedBy=multi-user.target -EOF - systemctl enable -q scrutiny.service - msg_ok "Created Scrutiny Webapp Service" - fi - - msg_info "Starting Scrutiny Webapp Service" - systemctl start scrutiny.service - msg_ok "Started Scrutiny Webapp Service" - exit -fi - -if [ "$UPD" == "3" ]; then - msg_info "Checking for Scrutiny Collector Service" - if systemctl list-units --full -all | grep -Fq 'scrutiny_collector.service'; then - msg_info "Stopping Scrutiny Collector Service" - systemctl stop scrutiny_collector.service - msg_ok "Stopped Scrutiny Collector Service" - else - msg_info "Scrutiny Collector Service not found, creating..." - wget -q -O /opt/scrutiny/bin/scrutiny-collector-metrics-linux-amd64 "https://github.com/AnalogJ/scrutiny/releases/download/${RELEASE}/scrutiny-collector-metrics-linux-amd64" - chmod +x /opt/scrutiny/bin/scrutiny-collector-metrics-linux-amd64 - cat </etc/systemd/system/scrutiny_collector.service -[Unit] -Description=Scrutiny Collector -After=network.target - -[Service] -Type=simple -ExecStart=/opt/scrutiny/bin/scrutiny-collector-metrics-linux-amd64 run --api-endpoint "http://localhost:8080" -Restart=always -User=root - -[Install] -WantedBy=multi-user.target -EOF - systemctl enable -q scrutiny_collector.service - msg_ok "Created Scrutiny Collector Service" - fi - - msg_info "Starting Scrutiny Collector Service" - systemctl start scrutiny_collector.service - msg_ok "Started Scrutiny Collector Service" - exit -fi -if [ "$UPD" == "4" ]; then - nano /opt/scrutiny/config/scrutiny.yaml - exit -fi -} - -start -build_container -description - -msg_ok "Completed Successfully!\n" -echo -e "${APP} Setup should be reachable by going to the following URL. - ${BL}http://${IP}:8080${CL} \n" From 122271dd34a5dcecd1550f3d5afa9b34f57c430d Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 29 Jun 2024 07:29:11 -0400 Subject: [PATCH 06/11] Update frigate-install.sh Update TensorFlow Lite URL fixes https://github.com/tteck/Proxmox/issues/3285 --- install/frigate-install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/frigate-install.sh b/install/frigate-install.sh index 50847e70c..52b3cb2d4 100644 --- a/install/frigate-install.sh +++ b/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 From a078adfaea00044fc89ea110259a75cb6df935d1 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 29 Jun 2024 11:03:54 -0400 Subject: [PATCH 07/11] Update install.func tweak --- misc/install.func | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/install.func b/misc/install.func index 80a5c2e26..c698e2584 100644 --- a/misc/install.func +++ b/misc/install.func @@ -165,6 +165,7 @@ EOF fi $STD apt-get update $STD apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade + rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Container OS" } From 482f60f90a7e8e00516c475158658a9c58c23899 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 29 Jun 2024 11:10:12 -0400 Subject: [PATCH 08/11] Update sabnzbd-install.sh tweak --- install/sabnzbd-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/sabnzbd-install.sh b/install/sabnzbd-install.sh index 63e919c9c..efeb7c0f3 100644 --- a/install/sabnzbd-install.sh +++ b/install/sabnzbd-install.sh @@ -29,10 +29,10 @@ msg_ok "Installed Dependencies" msg_info "Updating Python3" $STD apt-get install -y \ - python3 \ python3-dev \ python3-pip $STD apt-get install -y python3-setuptools +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing SABnzbd" From ecb4294a184812b5b68f5d58fbaf65c7aad0bc4a Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 29 Jun 2024 11:18:26 -0400 Subject: [PATCH 09/11] fix EXTERNALLY-MANAGED --- install/bazarr-install.sh | 1 + install/changedetection-install.sh | 1 + install/deluge-install.sh | 1 + install/esphome-install.sh | 1 + install/homeassistant-install.sh | 1 + install/motioneye-install.sh | 1 + install/octoprint-install.sh | 1 + install/scrypted-install.sh | 1 + install/tandoor-install.sh | 1 + install/tautulli-install.sh | 1 + install/whoogle-install.sh | 1 + 11 files changed, 11 insertions(+) diff --git a/install/bazarr-install.sh b/install/bazarr-install.sh index 5f5e6ac46..a4ee4cbb4 100755 --- a/install/bazarr-install.sh +++ b/install/bazarr-install.sh @@ -24,6 +24,7 @@ $STD apt-get install -y \ python3 \ python3-dev \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing Bazarr" diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index 95050bd78..5a10f7795 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -52,6 +52,7 @@ $STD apt-get install -y \ python3 \ python3-dev \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Setting up Node.js Repository" diff --git a/install/deluge-install.sh b/install/deluge-install.sh index a08580fcd..979b22b65 100644 --- a/install/deluge-install.sh +++ b/install/deluge-install.sh @@ -25,6 +25,7 @@ $STD apt-get install -y \ python3 \ python3-dev \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing Deluge" diff --git a/install/esphome-install.sh b/install/esphome-install.sh index a5732a84f..301d9bbb8 100644 --- a/install/esphome-install.sh +++ b/install/esphome-install.sh @@ -26,6 +26,7 @@ $STD apt-get install -y \ python3-dev \ python3-pip \ python3-venv +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing ESPHome" diff --git a/install/homeassistant-install.sh b/install/homeassistant-install.sh index 8d78d316a..088fc4d3e 100644 --- a/install/homeassistant-install.sh +++ b/install/homeassistant-install.sh @@ -25,6 +25,7 @@ $STD apt-get install -y \ python3-dev \ python3-pip \ python3-venv +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing runlike" diff --git a/install/motioneye-install.sh b/install/motioneye-install.sh index fe854002b..99e244134 100644 --- a/install/motioneye-install.sh +++ b/install/motioneye-install.sh @@ -26,6 +26,7 @@ $STD apt-get install -y \ python3 \ python3-dev \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing Motion" diff --git a/install/octoprint-install.sh b/install/octoprint-install.sh index 1cbcf0aed..ac9eacfb8 100644 --- a/install/octoprint-install.sh +++ b/install/octoprint-install.sh @@ -30,6 +30,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" diff --git a/install/scrypted-install.sh b/install/scrypted-install.sh index 2ac2d72e4..ad71ba925 100644 --- a/install/scrypted-install.sh +++ b/install/scrypted-install.sh @@ -79,6 +79,7 @@ $STD apt-get install -y \ python3 \ python3-dev \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing Python3 Dependencies" diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index abbf06e7b..53f88333b 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -38,6 +38,7 @@ $STD apt-get install -y \ python3-dev \ python3-setuptools \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Setting up Node.js Repository" diff --git a/install/tautulli-install.sh b/install/tautulli-install.sh index 23d7e4aa4..234083908 100644 --- a/install/tautulli-install.sh +++ b/install/tautulli-install.sh @@ -26,6 +26,7 @@ $STD apt-get install -y \ python3 \ python3-dev \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing Tautulli" diff --git a/install/whoogle-install.sh b/install/whoogle-install.sh index fac084009..f3516d322 100644 --- a/install/whoogle-install.sh +++ b/install/whoogle-install.sh @@ -24,6 +24,7 @@ $STD apt-get install -y \ python3 \ python3-dev \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Updated Python3" msg_info "Installing Whoogle" From 7d142d593e7c748b8507db9c681302a7ecdd9f06 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 29 Jun 2024 12:15:00 -0400 Subject: [PATCH 10/11] Update update-lxcs.sh tweak --- misc/update-lxcs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/update-lxcs.sh b/misc/update-lxcs.sh index 3c54ce3fa..9167186e9 100644 --- a/misc/update-lxcs.sh +++ b/misc/update-lxcs.sh @@ -67,7 +67,7 @@ function update_container() { alpine) pct exec "$container" -- ash -c "apk update && apk upgrade" ;; archlinux) pct exec "$container" -- bash -c "pacman -Syyu --noconfirm" ;; fedora | rocky | centos | alma) pct exec "$container" -- bash -c "dnf -y update && dnf -y upgrade" ;; - ubuntu | debian | devuan) pct exec "$container" -- bash -c "apt-get update 2>/dev/null | grep 'packages.*upgraded'; apt list --upgradable && apt-get -yq dist-upgrade 2>&1" ;; + ubuntu | debian | devuan) pct exec "$container" -- bash -c "apt-get update 2>/dev/null | grep 'packages.*upgraded'; apt list --upgradable && apt-get -yq dist-upgrade 2>&1; rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED" ;; esac } From 59b2d529a2da518672f4ebf9f521714055ff841e Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 29 Jun 2024 12:16:30 -0400 Subject: [PATCH 11/11] Update update-lxcs-cron.sh tweak --- misc/update-lxcs-cron.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/update-lxcs-cron.sh b/misc/update-lxcs-cron.sh index ebd6e972f..23c448520 100644 --- a/misc/update-lxcs-cron.sh +++ b/misc/update-lxcs-cron.sh @@ -22,7 +22,7 @@ function update_container() { alpine) pct exec "$container" -- ash -c "apk update && apk upgrade" ;; archlinux) pct exec "$container" -- bash -c "pacman -Syyu --noconfirm" ;; fedora | rocky | centos | alma) pct exec "$container" -- bash -c "dnf -y update && dnf -y upgrade" ;; - ubuntu | debian | devuan) pct exec "$container" -- bash -c "apt-get update 2>/dev/null | grep 'packages.*upgraded'; apt-get upgrade --dry-run && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confold" dist-upgrade -y" ;; + ubuntu | debian | devuan) pct exec "$container" -- bash -c "apt-get update 2>/dev/null | grep 'packages.*upgraded'; apt-get upgrade --dry-run && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confold" dist-upgrade -y; rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED" ;; esac }