From 3766842060f797857a155b1373f617d78f4649b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 14 Jan 2024 22:44:20 +0100 Subject: [PATCH] fix install_dir/venv --- conf/systemd.service | 2 +- scripts/install | 2 +- sources/extra_files/mopidyctl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index c62d093..95c2c82 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -11,7 +11,7 @@ After=sound.target [Service] User=__APP__ PermissionsStartOnly=true -ExecStart=__INSTALL_DIR__/env/bin/__APP__ --config __INSTALL_DIR__/__APP__.conf +ExecStart=__INSTALL_DIR__/venv/bin/__APP__ --config __INSTALL_DIR__/__APP__.conf [Install] WantedBy=multi-user.target diff --git a/scripts/install b/scripts/install index 5390015..8ed52ff 100755 --- a/scripts/install +++ b/scripts/install @@ -30,7 +30,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_script_progression --message="Install in Python environment..." --weight=30 _mopidy_install -# patch -u $install_dir/env/lib/python$python_version/site-packages/mopidy/__main__.py -i ../sources/patches/__main__.patch --forward +# patch -u $install_dir/venv/lib/python$python_version/site-packages/mopidy/__main__.py -i ../sources/patches/__main__.patch --forward chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" diff --git a/sources/extra_files/mopidyctl b/sources/extra_files/mopidyctl index debe6e0..8131497 100644 --- a/sources/extra_files/mopidyctl +++ b/sources/extra_files/mopidyctl @@ -1,9 +1,9 @@ #!/bin/sh SELF=$(basename $0) -DAEMON="__FINAL_PATH__/env/bin/mopidy" +DAEMON="__INSTALL_DIR__/venv/bin/mopidy" DAEMON_USER="__APP__" -CONFIG_FILES="__FINAL_PATH__/__APP__.conf" +CONFIG_FILES="__INSTALL_DIR__/__APP__.conf" CMD="$DAEMON --config $CONFIG_FILES $@" if [ $# -eq 0 ]; then