From a18616b9cfdafdceea4831bde0760fc84ad31a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Wed, 20 Mar 2024 21:48:59 +0100 Subject: [PATCH] final_path -> install_dir --- conf/server.conf | 2 +- scripts/config | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/server.conf b/conf/server.conf index 29e201e..69a90d4 100644 --- a/conf/server.conf +++ b/conf/server.conf @@ -9,7 +9,7 @@ db_password = __DB_PWD__ __CONTENT__ __CONTENT2__ __CONTENT3__ -addons_path = __FINAL_PATH__/__APPNAME__/addons,__FINAL_PATH__/custom-addons +addons_path = __INSTALL_DIR__/__APPNAME__/addons,__INSTALL_DIR__/custom-addons proxy_mode = true logfile = /var/log/__APP__.log xmlrpc_interface = 127.0.0.1 diff --git a/scripts/config b/scripts/config index 92659f2..5ede183 100755 --- a/scripts/config +++ b/scripts/config @@ -2,8 +2,8 @@ source /usr/share/yunohost/helpers ynh_abort_if_errors -CUSTOM_ADDONS=$final_path/custom-addons -VENV=$final_path/venv +CUSTOM_ADDONS=$install_dir/custom-addons +VENV=$install_dir/venv CUSTOM_REPO=$CUSTOM_ADDONS/custom-repo REPOS_YML=$CUSTOM_REPO/repos.yml REQUIREMENTS_TXT=$CUSTOM_REPO/requirements.txt @@ -83,7 +83,7 @@ run__update_code() { ynh_exec_as $app $VENV/bin/pip3 install -Ur $CUSTOM_REPO/requirements.txt fi ynh_script_progression --message="Updating odoo addons and restarting the service" - sudo -u $app $VENV/bin/python $final_path/libreerp/odoo-bin shell -d $app -c /etc/$app/main.conf --logfile /proc/self/fd/1 <