From f8737de518f5f4893e7619e40e5e6eafe9581f5f Mon Sep 17 00:00:00 2001 From: anmol26s Date: Fri, 25 May 2018 22:19:15 +0530 Subject: [PATCH] Dependecy fix for stretch --- scripts/install | 7 +++++-- scripts/restore | 7 +++++-- scripts/upgrade | 6 ++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index ac609ed0..2ec6b0e8 100755 --- a/scripts/install +++ b/scripts/install @@ -66,8 +66,11 @@ ynh_app_setting_set $app database $database #================================================= # INSTALL DEPENDENCIES #================================================= - -ynh_install_app_dependencies php5-cli php5-imagick php5-gd php5-mcrypt php-xml +pkg_dependencies=php5-cli php5-imagick php5-gd php5-mcrypt +if [ "$(lsb_release --codename --short)" != "jessie" ]; then + pkg_dependencies="$pkg_dependencies php-xml" +fi +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE A MYSQL DATABASE diff --git a/scripts/restore b/scripts/restore index d711d8eb..cbd5f6c6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -84,8 +84,11 @@ ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini" # REINSTALL DEPENDENCIES #================================================= -# Define and install dependencies -ynh_install_app_dependencies php5-cli php5-imagick php5-gd php5-mcrypt php-xml +pkg_dependencies=php5-cli php5-imagick php5-gd php5-mcrypt +if [ "$(lsb_release --codename --short)" != "jessie" ]; then + pkg_dependencies="$pkg_dependencies php-xml" +fi +ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE CRON FILE diff --git a/scripts/upgrade b/scripts/upgrade index 8e74a877..ca87fa38 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -125,6 +125,12 @@ ynh_use_logrotate "$final_path/php.log" --non-append sed -i "s@YNH_WWW_PATH@$final_path@g" ../conf/poller-cron sudo cp ../conf/poller-cron /etc/cron.d/$app +pkg_dependencies=php5-cli php5-imagick php5-gd php5-mcrypt +if [ "$(lsb_release --codename --short)" != "jessie" ]; then + pkg_dependencies="$pkg_dependencies php-xml" +fi +ynh_install_app_dependencies $pkg_dependencies + # Make app public ynh_app_setting_set $app skipped_uris "/"