瀏覽代碼

Code refactoring

tteckster 2 年之前
父節點
當前提交
1e1a69e3f1

+ 8 - 1
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

+ 4 - 2
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)

+ 7 - 3
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]

+ 10 - 6
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"
 

+ 9 - 7
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

+ 10 - 5
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? <y/N> " prompt
 if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then

+ 8 - 0
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

+ 7 - 3
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