From 83aab4357092c61eb241113333eb0cb9ac80926c Mon Sep 17 00:00:00 2001 From: thicknesss <42098667+thicknesss@users.noreply.github.com> Date: Sat, 25 May 2024 20:15:51 +0200 Subject: [PATCH] Update packages.bash eddited miflora installation (#1869) Debain 12 (Bookworm) forces the use of python virtual enviroments for some packages. Installation script for miflora-mqtt-daemon is edited according to the proposed change in the README of miflora-mqtt-daemon. See PR: https://github.com/ThomDietrich/miflora-mqtt-daemon/pull/176. PR https://github.com/ThomDietrich/miflora-mqtt-daemon/pull/175 is made to update the systemd service file. which will be used also when installing the package via openhabian-config. Signed-off-by: thicknesss <42098667+thicknesss@users.noreply.github.com> --- functions/packages.bash | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/functions/packages.bash b/functions/packages.bash index 30cb16839..7bb614284 100644 --- a/functions/packages.bash +++ b/functions/packages.bash @@ -440,10 +440,16 @@ miflora_setup() { cond_echo "Filesystem permissions corrections... " if ! cond_redirect chown -R "openhab:${username:-openhabian}" "$mifloraDir"; then echo "FAILED (permissions)"; return 1; fi if ! cond_redirect chmod -R ug+wX "$mifloraDir"; then echo "FAILED (permissons)"; return 1; fi - +## For Debian 12 (Bookworm) compatibility we need to make a Python Virtual Enviroment (venv) + cond_echo "Preparing python virtual enviroment" + cond_redirect python -m venv --system-site-packages "$mifloraDir"/env + cond_redirect source "$mifloraDir"/env/bin/activate +## original code from here cond_echo "Installing required python packages" - cond_redirect pip3 install -r "$mifloraDir"/requirements.txt - + cond_redirect "$mifloraDir"/env/bin/pip3 install -r "$mifloraDir"/requirements.txt +## deactivate venv to avoid conflicts with other functions + cond_redirect "$mifloraDir"/env/bin/deactivate +## original code from here echo -n "$(timestamp) [openHABian] Setting up miflora-mqtt-daemon service... " if ! cond_redirect install -m 644 "$mifloraDir"/template.service /etc/systemd/system/miflora.service; then echo "FAILED (copy service)"; return 1; fi if ! cond_redirect systemctl -q daemon-reload; then echo "FAILED (daemon-reload)"; return 1; fi