From 591c37cbacd5ee558074c38adfb33b2dbc20dd6f Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Wed, 4 Jun 2025 13:52:34 +0200
Subject: [PATCH] harmonize .venv

---
 install/bazarr-install.sh           |  2 +-
 install/deluge-install.sh           |  1 +
 install/documenso-install.sh        |  2 +-
 install/esphome-install.sh          |  2 +-
 install/spoolman-install.sh         |  6 +++---
 install/streamlink-webui-install.sh |  4 +---
 install/tandoor-install.sh          | 15 ++++++++-------
 install/tasmocompiler-install.sh    |  6 ++++--
 install/tautulli-install.sh         |  9 +++++----
 install/unmanic-install.sh          |  8 +++++---
 install/wger-install.sh             |  4 ++--
 11 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/install/bazarr-install.sh b/install/bazarr-install.sh
index 3d4d35686..9c614ef5f 100755
--- a/install/bazarr-install.sh
+++ b/install/bazarr-install.sh
@@ -22,7 +22,7 @@ $STD unzip bazarr -d /opt/bazarr
 chmod 775 /opt/bazarr /var/lib/bazarr/
 cd /opt/bazarr
 $STD uv venv /opt/bazarr/.venv
-$STD uv pip install -r requirements.txt
+$STD /opt/bazarr/.venv/bin/python -m pip install -r requirements.txt
 msg_ok "Installed Bazarr"
 
 msg_info "Creating Service"
diff --git a/install/deluge-install.sh b/install/deluge-install.sh
index 02fbf2245..413bdc0de 100644
--- a/install/deluge-install.sh
+++ b/install/deluge-install.sh
@@ -21,6 +21,7 @@ PYTHON_VERSION="3.12" setup_uv
 
 msg_info "Installing Deluge"
 mkdir -p /opt/deluge
+cd /opt/deluge
 $STD uv venv /opt/deluge/.venv
 $STD uv pip install deluge[all]
 msg_ok "Installed Deluge"
diff --git a/install/documenso-install.sh b/install/documenso-install.sh
index ac0c94320..47e8d7093 100644
--- a/install/documenso-install.sh
+++ b/install/documenso-install.sh
@@ -55,7 +55,7 @@ $STD unzip v${RELEASE}.zip
 mv documenso-${RELEASE} /opt/documenso
 cd /opt/documenso
 $STD uv venv /opt/documenso/.venv
-$STD /opt/documenso/.venv/bin/uv pip install bcrypt
+$STD uv pip install bcrypt
 mv .env.example /opt/documenso/.env
 sed -i \
   -e "s|^NEXTAUTH_SECRET=.*|NEXTAUTH_SECRET='$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | cut -c1-32)'|" \
diff --git a/install/esphome-install.sh b/install/esphome-install.sh
index 892ed16d5..6ec7f9cee 100644
--- a/install/esphome-install.sh
+++ b/install/esphome-install.sh
@@ -22,7 +22,7 @@ PYTHON_VERSION="3.12" setup_uv
 msg_info "Setting up Virtual Environment"
 mkdir -p /opt/esphome
 $STD uv venv /opt/esphome/.venv
-$STD /opt/esphome/.venv/bin/uv pip install esphome tornado esptool
+$STD uv pip install esphome tornado esptool
 msg_ok "Setup and Installed ESPHome"
 
 msg_info "Creating Service"
diff --git a/install/spoolman-install.sh b/install/spoolman-install.sh
index beee29ed2..5b013924f 100644
--- a/install/spoolman-install.sh
+++ b/install/spoolman-install.sh
@@ -31,8 +31,8 @@ curl -fsSL "https://github.com/Donkie/Spoolman/releases/download/$RELEASE/spoolm
 $STD unzip spoolman.zip -d spoolman
 rm -f spoolman.zip
 cd spoolman
-$STD uv venv /opt/spoolman/venv
-$STD /opt/spoolman/venv/bin/uv pip install -r requirements.txt
+$STD uv venv /opt/spoolman/.venv
+$STD uv pip install -r requirements.txt
 curl -fsSL "https://raw.githubusercontent.com/Donkie/Spoolman/master/.env.example" -o ".env"
 echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 msg_ok "Installed Spoolman"
@@ -47,7 +47,7 @@ After=network.target
 Type=simple
 WorkingDirectory=/opt/spoolman
 EnvironmentFile=/opt/spoolman/.env
-ExecStart=/opt/spoolman/venv/bin/uvicorn spoolman.main:app --host 0.0.0.0 --port 7912
+ExecStart=/opt/spoolman/.venv/bin/uvicorn spoolman.main:app --host 0.0.0.0 --port 7912
 Restart=always
 User=root
 
diff --git a/install/streamlink-webui-install.sh b/install/streamlink-webui-install.sh
index 2ab9fe6a2..c1ed5c51a 100644
--- a/install/streamlink-webui-install.sh
+++ b/install/streamlink-webui-install.sh
@@ -14,9 +14,7 @@ setting_up_container
 network_check
 update_os
 
-NODE_VERSION="22"
-NODE_MODULE="npm@latest,yarn@latest"
-install_node_and_modules
+NODE_VERSION="22" NODE_MODULE="npm@latest,yarn@latest" install_node_and_modules
 setup_uv
 fetch_and_deploy_gh_release "CrazyWolf13/streamlink-webui"
 
diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh
index e514d17ba..826513a1a 100644
--- a/install/tandoor-install.sh
+++ b/install/tandoor-install.sh
@@ -38,8 +38,9 @@ NODE_VERSION="20" NODE_MODULE="yarn@latest" install_node_and_modules
 msg_info "Installing Tandoor (Patience)"
 $STD git clone https://github.com/TandoorRecipes/recipes -b master /opt/tandoor
 mkdir -p /opt/tandoor/{config,api,mediafiles,staticfiles}
-$STD uv venv /opt/tandoor/venv
-$STD /opt/tandoor/venv/bin/uv pip install -r /opt/tandoor/requirements.txt
+cd /opt/tandoor
+$STD uv venv /opt/tandoor/.venv
+$STD uv pip install -r requirements.txt
 
 cd /opt/tandoor/vue
 $STD yarn install
@@ -59,7 +60,7 @@ sed -i -e "s|SECRET_KEY=.*|SECRET_KEY=$secret_key|g" \
   -e "s|POSTGRES_USER=.*|POSTGRES_USER=$DB_USER|g" \
   -e "\$a\STATIC_URL=/staticfiles/" /opt/tandoor/.env
 cd /opt/tandoor
-$STD /opt/tandoor/venv/bin/uv run python version.py
+$STD uv run python version.py
 msg_ok "Installed Tandoor"
 
 msg_info "Install/Set up PostgreSQL Database"
@@ -77,9 +78,9 @@ echo -e "Tandoor Database Name: \e[32m$DB_NAME\e[0m" >>~/tandoor.creds
 echo -e "Tandoor Database User: \e[32m$DB_USER\e[0m" >>~/tandoor.creds
 echo -e "Tandoor Database Password: \e[32m$DB_PASS\e[0m" >>~/tandoor.creds
 export $(cat /opt/tandoor/.env | grep "^[^#]" | xargs)
-$STD /opt/tandoor/venv/bin/uv run python manage.py migrate
-$STD /opt/tandoor/venv/bin/uv run python manage.py collectstatic --no-input
-$STD /opt/tandoor/venv/bin/uv run python manage.py collectstatic_js_reverse
+$STD uv run python manage.py migrate
+$STD uv run python manage.py collectstatic --no-input
+$STD uv run python manage.py collectstatic_js_reverse
 msg_ok "Set up PostgreSQL Database"
 
 msg_info "Creating Services"
@@ -94,7 +95,7 @@ Restart=always
 RestartSec=3
 WorkingDirectory=/opt/tandoor
 EnvironmentFile=/opt/tandoor/.env
-ExecStart=/opt/tandoor/venv/bin/gunicorn --error-logfile /tmp/gunicorn_err.log --log-level debug --capture-output --bind unix:/opt/tandoor/tandoor.sock recipes.wsgi:application
+ExecStart=/opt/tandoor/.venv/bin/gunicorn --error-logfile /tmp/gunicorn_err.log --log-level debug --capture-output --bind unix:/opt/tandoor/tandoor.sock recipes.wsgi:application
 
 [Install]
 WantedBy=multi-user.target
diff --git a/install/tasmocompiler-install.sh b/install/tasmocompiler-install.sh
index a4ad10158..1e31b51c9 100644
--- a/install/tasmocompiler-install.sh
+++ b/install/tasmocompiler-install.sh
@@ -21,8 +21,10 @@ PYTHON_VERSION="3.12" setup_uv
 NODE_VERSION="22" NODE_MODULE="yarn@latest" install_node_and_modules
 
 msg_info "Setup Platformio"
-uv venv /opt/tasmocompiler/venv
-$STD /opt/tasmocompiler/venv/bin/uv pip install platformio
+mkdir -p /opt/tasmocompiler
+cd /opt/tasmocompiler
+$STD uv venv /opt/tasmocompiler/.venv
+$STD uv pip install platformio
 msg_ok "Setup Platformio"
 
 msg_info "Setup TasmoCompiler"
diff --git a/install/tautulli-install.sh b/install/tautulli-install.sh
index 9723018b5..7c82a8991 100644
--- a/install/tautulli-install.sh
+++ b/install/tautulli-install.sh
@@ -22,9 +22,10 @@ PYTHON_VERSION="3.12" setup_uv
 msg_info "Installing Tautulli"
 cd /opt
 $STD git clone https://github.com/Tautulli/Tautulli.git
-$STD uv venv /opt/Tautulli/venv
-$STD /opt/Tautulli/venv/bin/uv pip install -r /opt/Tautulli/requirements.txt
-$STD /opt/Tautulli/venv/bin/uv pip install pyopenssl
+cd /opt/Tautulli
+$STD uv venv /opt/Tautulli/.venv
+$STD uv pip install -r /opt/Tautulli/requirements.txt
+$STD uv pip install pyopenssl
 msg_ok "Installed Tautulli"
 
 msg_info "Creating Service"
@@ -38,7 +39,7 @@ WorkingDirectory=/opt/Tautulli/
 Restart=on-failure
 RestartSec=5
 Type=simple
-ExecStart=/opt/Tautulli/venv/bin/python /opt/Tautulli/Tautulli.py
+ExecStart=/opt/Tautulli/.venv/bin/python /opt/Tautulli/Tautulli.py
 KillSignal=SIGINT
 TimeoutStopSec=20
 SyslogIdentifier=tautulli
diff --git a/install/unmanic-install.sh b/install/unmanic-install.sh
index 90152be2a..7f7c8dd7b 100644
--- a/install/unmanic-install.sh
+++ b/install/unmanic-install.sh
@@ -34,8 +34,10 @@ if [[ "$CTTYPE" == "0" ]]; then
 fi
 
 msg_info "Installing Unmanic"
-uv venv /opt/unmanic/venv
-/opt/unmanic/venv/bin/uv pip install unmanic
+mkdir -p /opt/unmanic
+cd /opt/unmanic
+$STD uv venv /opt/unmanic/.venv
+$STD uv pip install unmanic
 sed -i -e 's/^sgx:x:104:$/render:x:104:root/' -e 's/^render:x:106:root$/sgx:x:106:/' /etc/group
 msg_ok "Installed Unmanic"
 
@@ -49,7 +51,7 @@ StartLimitBurst=3
 
 [Service]
 Type=simple
-ExecStart=/opt/unmanic/venv/bin/unmanic
+ExecStart=/opt/unmanic/.venv/bin/unmanic
 Restart=always
 RestartSec=30
 
diff --git a/install/wger-install.sh b/install/wger-install.sh
index 6686c6e53..32e6cefa1 100644
--- a/install/wger-install.sh
+++ b/install/wger-install.sh
@@ -39,8 +39,8 @@ tar xzf $RELEASE.tar.gz
 mv wger-$RELEASE /home/wger/src
 cd /home/wger/src
 $STD uv venv /home/wger/.venv
-$STD /home/wger/.venv/bin/uv pip install -r requirements_prod.txt
-$STD /home/wger/.venv/bin/uv pip install -e .
+$STD uv pip install -r requirements_prod.txt
+$STD uv pip install -e .
 $STD /home/wger/.venv/bin/wger create-settings --database-path /home/wger/db/database.sqlite
 sed -i "s#home/wger/src/media#home/wger/media#g" /home/wger/src/settings.py
 sed -i "/MEDIA_ROOT = '\/home\/wger\/media'/a STATIC_ROOT = '/home/wger/static'" /home/wger/src/settings.py