From c19ba6980f3c8b1dab7c0ae966342a33bfa861b8 Mon Sep 17 00:00:00 2001 From: Dante Date: Sat, 27 Aug 2022 22:44:19 +0100 Subject: [PATCH] Add e2be deps as regular dep and remove logic for extra deps --- scripts/_common.sh | 5 ++--- scripts/install | 5 ----- scripts/upgrade | 5 ----- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 8296088..b04153f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,9 +5,8 @@ #================================================= # dependencies used by the app -# HACK zlib1g-dev libjpeg-dev (libwebp-dev optional but necessary for stickers) are necessary to compile / install pillow -pkg_dependencies="postgresql python3 zlib1g-dev libjpeg-dev libwebp-dev python3-venv libpq-dev libffi-dev" -pkg_dependencies_e2be="libolm-dev" +# HACK zlib1g-dev libjpeg-dev (libwebp-dev and libolm-dev optional but necessary for stickers/e2be) are necessary to compile / install pillow +pkg_dependencies="postgresql python3 zlib1g-dev libjpeg-dev libwebp-dev python3-venv libpq-dev libffi-dev libolm-dev" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 7c19e49..6458f75 100755 --- a/scripts/install +++ b/scripts/install @@ -109,11 +109,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=97 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -if [ $encryption -eq 1 ]; then - # Install libolm-dev to be able to use encryption - ynh_add_app_dependencies $pkg_dependencies_e2be -fi - #================================================= # CREATE DEDICATED USER #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6c0bc28..5f1888b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,11 +99,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=1 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -if [ $encryption -eq 1 ]; then - # Install libolm-dev to be able to use encryption - ynh_add_app_dependencies $pkg_dependencies_e2be -fi - #================================================= # SPECIFIC UPGRADE #=================================================