From f5a173962e7fbd987ad675b7211c0b8615e983c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 8 Dec 2023 21:28:11 +0100 Subject: [PATCH] cd install_dir before running pip --- scripts/restore | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/restore b/scripts/restore index 078c8f3..0b788fd 100755 --- a/scripts/restore +++ b/scripts/restore @@ -40,7 +40,7 @@ chmod 740 $install_dir #Use venv to install pip requirements - Inspired from https://github.com/YunoHost-Apps/pyinventory_ynh/blob/master/scripts/install ynh_script_progression --message="Reinstalling pip requirements..." --weight=70 # Always recreate everything fresh with current python version -# When reinstalling on a new yunohost, this is required +# When reinstalling on a new yunohost, this is required if [ -d "${install_dir}/venv" ] ; then ynh_secure_remove "${install_dir}/venv" fi @@ -51,13 +51,14 @@ chown -R "$app:" "$install_dir" #run source in a 'sub shell' ( + cd "$install_dir" set +o nounset - source "${install_dir}/venv/bin/activate" + source "venv/bin/activate" set -o nounset - ynh_exec_as $app $install_dir/venv/bin/python3 -m ensurepip - ynh_exec_as $app $install_dir/venv/bin/pip3 install --upgrade wheel pip setuptools - ynh_exec_as $app $install_dir/venv/bin/pip3 install --no-cache-dir --upgrade -r "$install_dir/requirements.txt" - ynh_exec_as $app $install_dir/venv/bin/pip3 install --no-cache-dir --upgrade -r "$install_dir/optional-requirements.txt" + ynh_exec_as $app venv/bin/python3 -m ensurepip + ynh_exec_as $app venv/bin/pip3 install --upgrade wheel pip setuptools + ynh_exec_as $app venv/bin/pip3 install --no-cache-dir --upgrade -r "$install_dir/requirements.txt" + ynh_exec_as $app venv/bin/pip3 install --no-cache-dir --upgrade -r "$install_dir/optional-requirements.txt" ) #================================================= @@ -167,4 +168,3 @@ ynh_script_progression --message="Restoration completed for $app" --last # WARNING FOR READ ACCESS #================================================= ynh_print_warn "Please, give required access to $app user to the $calibre_dir folder." -