Add e2be deps as regular dep and remove logic for extra deps

This commit is contained in:
Dante 2022-08-27 22:44:19 +01:00
parent f75ce35a22
commit c19ba6980f
3 changed files with 2 additions and 13 deletions

View file

@ -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

View file

@ -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
#=================================================

View file

@ -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
#=================================================