From 1e1a69e3f11416d0146004fa9b494b39cb9d144b Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 21 Jun 2023 10:43:49 -0400 Subject: [PATCH] Code refactoring --- install/bazarr-install.sh | 9 ++++++++- install/changedetection-install.sh | 6 ++++-- install/deluge-install.sh | 10 +++++++--- install/motioneye-install.sh | 16 ++++++++++------ install/octoprint-install.sh | 16 +++++++++------- install/scrypted-install.sh | 15 ++++++++++----- install/tautulli-install.sh | 8 ++++++++ install/whoogle-install.sh | 10 +++++++--- 8 files changed, 63 insertions(+), 27 deletions(-) diff --git a/install/bazarr-install.sh b/install/bazarr-install.sh index 9e847172..1b8beeea 100755 --- a/install/bazarr-install.sh +++ b/install/bazarr-install.sh @@ -17,9 +17,16 @@ 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 python3-pip 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 +msg_ok "Updated Python3" + msg_info "Installing Bazarr" mkdir -p /var/lib/bazarr/ wget -q https://github.com/morpheus65535/bazarr/releases/latest/download/bazarr.zip diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index e1673b15..42d79ba5 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -43,11 +43,13 @@ $STD apt-get install -y \ xvfb msg_ok "Installed Dependencies" -msg_info "Installing Python3" +msg_info "Updating Python3" $STD apt-get install -y \ + python3 \ python3-dev \ python3-pip -msg_ok "Installed Python3" +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED +msg_ok "Updated Python3" msg_info "Setting up Node.js Repository" $STD bash <(curl -fsSL https://deb.nodesource.com/setup_18.x) diff --git a/install/deluge-install.sh b/install/deluge-install.sh index b42e24f6..5dda4f3c 100644 --- a/install/deluge-install.sh +++ b/install/deluge-install.sh @@ -19,9 +19,13 @@ $STD apt-get install -y sudo $STD apt-get install -y mc msg_ok "Installed Dependencies" -msg_info "Installing Python3-pip" -$STD apt-get install -y python3-pip -msg_ok "Installed Python3-pip" +msg_info "Updating Python3" +$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" $STD pip install deluge[all] diff --git a/install/motioneye-install.sh b/install/motioneye-install.sh index 5ebe8fc7..f7364e65 100644 --- a/install/motioneye-install.sh +++ b/install/motioneye-install.sh @@ -21,6 +21,14 @@ $STD apt-get install -y git $STD apt-get install -y cifs-utils 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 +msg_ok "Updated Python3" + msg_info "Installing Motion" $STD apt-get install -y motion systemctl stop motion @@ -31,22 +39,18 @@ msg_info "Installing FFmpeg" $STD apt-get install -y ffmpeg v4l-utils msg_ok "Installed FFmpeg" -msg_info "Installing Python3-pip" -$STD apt-get install -y python3-pip -msg_ok "Installed Python3-pip" - msg_info "Installing MotionEye" $STD apt-get update $STD pip install git+https://github.com/motioneye-project/motioneye.git@dev mkdir -p /etc/motioneye chown -R root:root /etc/motioneye chmod -R 777 /etc/motioneye -cp /usr/local/lib/python3.9/dist-packages/motioneye/extra/motioneye.conf.sample /etc/motioneye/motioneye.conf +wget -qO /etc/motioneye/motioneye.conf https://raw.githubusercontent.com/motioneye-project/motioneye/dev/motioneye/extra/motioneye.conf.sample mkdir -p /var/lib/motioneye msg_ok "Installed MotionEye" msg_info "Creating Service" -cp /usr/local/lib/python3.9/dist-packages/motioneye/extra/motioneye.systemd /etc/systemd/system/motioneye.service +wget -qO /etc/systemd/system/motioneye.service https://raw.githubusercontent.com/motioneye-project/motioneye/dev/motioneye/extra/motioneye.systemd systemctl enable -q --now motioneye msg_ok "Created Service" diff --git a/install/octoprint-install.sh b/install/octoprint-install.sh index 132eedd1..f6db1393 100644 --- a/install/octoprint-install.sh +++ b/install/octoprint-install.sh @@ -21,14 +21,16 @@ $STD apt-get install -y git $STD apt-get install -y libyaml-dev $STD apt-get install -y build-essential msg_ok "Installed Dependencies" - -msg_info "Installing Python3" + +msg_info "Updating Python3" $STD apt-get install -y \ - python3-pip \ - python3-dev \ - python3-setuptools \ - python3-venv -msg_ok "Installed Python3" + python3 \ + python3-dev \ + python3-pip \ + python3-venv +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED +$STD apt-get install -y python3-setuptools +msg_ok "Updated Python3" msg_info "Creating user octoprint" useradd -m -s /bin/bash -p $(openssl passwd -1 octoprint) octoprint diff --git a/install/scrypted-install.sh b/install/scrypted-install.sh index b1df07e1..e0015615 100644 --- a/install/scrypted-install.sh +++ b/install/scrypted-install.sh @@ -58,23 +58,28 @@ msg_info "Installing Node.js" $STD apt-get install -y nodejs msg_ok "Installed Node.js" -msg_info "Installing Python3" +msg_info "Updating Python3" +$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" $STD apt-get -y install \ - python3 \ - python3-dev \ python3-gi \ python3-gst-1.0 \ python3-matplotlib \ python3-numpy \ python3-opencv \ python3-pil \ - python3-pip \ python3-setuptools \ python3-skimage \ python3-wheel $STD python3 -m pip install --upgrade pip $STD python3 -m pip install aiofiles debugpy typing_extensions typing -msg_ok "Installed Python3" +msg_ok "Installed Python3 Dependencies" read -r -p "Would you like to add Coral Edge TPU support? " prompt if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then diff --git a/install/tautulli-install.sh b/install/tautulli-install.sh index 502e4536..f0eb77b3 100644 --- a/install/tautulli-install.sh +++ b/install/tautulli-install.sh @@ -21,6 +21,14 @@ $STD apt-get install -y git $STD apt-get install -y pip 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 +msg_ok "Updated Python3" + msg_info "Installing Tautulli" cd /opt $STD git clone https://github.com/Tautulli/Tautulli.git diff --git a/install/whoogle-install.sh b/install/whoogle-install.sh index 1eb492f2..1381f662 100644 --- a/install/whoogle-install.sh +++ b/install/whoogle-install.sh @@ -19,9 +19,13 @@ $STD apt-get install -y sudo $STD apt-get install -y mc msg_ok "Installed Dependencies" -msg_info "Installing Python3-pip" -$STD apt-get install -y python3-pip -msg_ok "Installed Python3-pip" +msg_info "Updating Python3" +$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" $STD pip install brotli