From b3996795a37ad3148224673ad8c748a9175cc281 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 1 Feb 2022 21:40:09 +0100 Subject: [PATCH 1/3] Use major version for Python call in install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a7a5ef7..56f59f1 100755 --- a/scripts/install +++ b/scripts/install @@ -112,7 +112,7 @@ ynh_script_progression --message="Installing Bazarr and its dependencies..." --w pushd $final_path # Initialize virtual environment - ynh_exec_as $app python${python_version} -m venv venv + ynh_exec_as $app python${python_major_version} -m venv venv ynh_exec_as $app $final_path/venv/bin/pip install -r "$final_path/requirements.txt" popd From c67aa60f96e39f3f79047696976988719d149324 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 1 Feb 2022 21:41:38 +0100 Subject: [PATCH 2/3] Use major version for Python call in upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f455546..21b4a7a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -114,7 +114,7 @@ ynh_script_progression --message="Upgrading Bazarr and its dependencies..." --we pushd $final_path # Initialize virtual environment - ynh_exec_as $app python${python_version} -m venv venv + ynh_exec_as $app python${python_major_version} -m venv venv ynh_exec_as $app $final_path/venv/bin/pip install -r "$final_path/requirements.txt" popd From dae1e51c01f68bad9dc5561f25719e9cd2ed392d Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 4 Feb 2022 18:25:27 +0100 Subject: [PATCH 3/3] Fix dependencies listing --- scripts/_common.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 481859e..fcd492d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,15 +7,9 @@ python_version="3.7" python_major_version=$(echo $python_version | cut -d. -f1) -# dependencies used by the app -if [[ $YNH_ARCH != arm* ]] -then - pkg_dependencies="libxml2-dev libxslt1-dev python3-dev python3-libxml2 python3-lxml unrar-free ffmpeg libatlas-base-dev" -else - pkg_dependencies="libxml2-dev libxslt1-dev python3-dev python3-libxml2 python3-lxml unrar-free ffmpeg libatlas-base-dev" -fi - -pkg_dependencies+=" python${python_major_version}-venv" +pkg_dependencies="libxml2-dev libxslt1-dev unrar-free ffmpeg libatlas-base-dev" +pkg_dependencies+=" python${python_major_version}-libxml2 python${python_major_version}-lxml" +pkg_dependencies+=" python${python_major_version}-dev python${python_major_version}-venv" #================================================= # PERSONAL HELPERS