From f5f37c9f60e1e96310659fc69ab6fceb4ce534c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sat, 7 Jul 2018 11:21:43 +0200 Subject: [PATCH] new way to install dependencies --- scripts/_common.sh | 3 +-- scripts/install | 5 ++--- scripts/restore | 3 +++ scripts/upgrade | 5 ++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 02d8e02..94aa76a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -36,6 +36,5 @@ extract_freshrss() { } install_freshrss_dependencies() { - ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control \ - || ynh_die "Unable to install dependencies" + ynh_install_app_dependencies php-cli php-gmp } diff --git a/scripts/install b/scripts/install index d2bf2bb..3fcd5d5 100755 --- a/scripts/install +++ b/scripts/install @@ -41,9 +41,8 @@ fi # Check domain/path availability sudo yunohost app register-url $app $domain $path -#install php5-cli -ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control \ - || ynh_die "Unable to install dependencies" +#install php dependencies +install_freshrss_dependencies # Generate random DES key & password deskey=$(ynh_string_random) diff --git a/scripts/restore b/scripts/restore index c6bf2c5..d568e0d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,6 +19,9 @@ sudo yunohost app register-url $app $domain $path db_pass=$(ynh_app_setting_get $app mysqlpwd) +#install php dependencies if necessary +install_freshrss_dependencies + # Restore sources & data final_path=/var/www/$app ynh_restore_file "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index e66bd78..c830c61 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -11,9 +11,8 @@ set -eu app=$YNH_APP_INSTANCE_NAME FINAL_PATH="/var/www/$app" -#install extention for api if necessary -ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control \ - || ynh_die "Unable to install dependencies" +#install php dependencies if necessary +install_freshrss_dependencies # Check destination directory [[ ! -d $FINAL_PATH ]] && ynh_die \