From 61a4df5143ff45e42109b80dc732856a7dc2a59e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 29 Jun 2021 22:30:48 +0200 Subject: [PATCH] Fix bullseye dependencies --- scripts/_common.sh | 1 + scripts/install | 9 +++++++-- scripts/restore | 9 +++++++-- scripts/upgrade | 9 +++++++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9c7a7b7..835a497 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,6 +7,7 @@ # dependencies used by the app pkg_dependencies="build-essential inotify-tools postgresql postgresql-client postgresql-contrib postgis postgresql-postgis-scripts git curl unzip gnupg openssl make gcc libc-dev argon2 imagemagick webp gifsicle jpegoptim optipng pngquant cmake" extra_pkg_dependencies="elixir esl-erlang" +extra_debian_pkg_dependencies="elixir erlang-dev erlang-nox" NODEJS_VERSION=14 diff --git a/scripts/install b/scripts/install index d66b0ca..001c80e 100644 --- a/scripts/install +++ b/scripts/install @@ -79,8 +79,13 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key='https://dl.yarnpkg.com/debian/pubkey.gpg' -lsb_name="$(lsb_release --codename --short)" -ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +then + ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies +else + lsb_name="$(lsb_release --codename --short)" + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +fi #================================================= # CREATE DEDICATED USER diff --git a/scripts/restore b/scripts/restore index 147bb5d..f2be272 100644 --- a/scripts/restore +++ b/scripts/restore @@ -109,8 +109,13 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key='https://dl.yarnpkg.com/debian/pubkey.gpg' -lsb_name="$(lsb_release --codename --short)" -ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +then + ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies +else + lsb_name="$(lsb_release --codename --short)" + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +fi #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 4604a14..6511b16 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -214,8 +214,13 @@ ynh_install_app_dependencies $pkg_dependencies ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -lsb_name="$(lsb_release --codename --short)" -ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +if $(dpkg --compare-versions $(cat /etc/debian_version) gt "11.0") +then + ynh_add_app_dependencies --package=$extra_debian_pkg_dependencies +else + lsb_name="$(lsb_release --codename --short)" + ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' +fi #================================================= # SPECIFIC UPGRADE