From 9fb373556852fb4cc305442c4d53709f56175cad Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 14 Nov 2021 15:36:29 +0100
Subject: [PATCH] php install

---
 scripts/_common.sh | 16 ++++++++--------
 scripts/install    |  2 +-
 scripts/restore    |  2 +-
 scripts/upgrade    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index e889d03..a6f73f7 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -9,15 +9,15 @@ YNH_PHP_VERSION="7.4"
 # Composer version
 YNH_COMPOSER_VERSION="2.1.3"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl"
+pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysqli php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl"
 
-# needed for raw upload and video playback
-# ufraw-batch is not supported in bullseye
-if ! (apt-cache -q=0 show ufraw-batch |& grep ': No packages found' &>/dev/null); then
-	pkg_dependencies="ffmpeg"
-else
-	pkg_dependencies="ufraw-batch ffmpeg"
-fi
+# # needed for raw upload and video playback
+# # ufraw-batch is not supported in bullseye
+# if ! (apt-cache -q=0 show ufraw-batch |& grep ': No packages found' &>/dev/null); then
+# 	pkg_dependencies="ffmpeg"
+# else
+# 	pkg_dependencies="ufraw-batch ffmpeg"
+# fi
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 71fa821..ae4af78 100755
--- a/scripts/install
+++ b/scripts/install
@@ -112,7 +112,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index d6ebb19..0288fdc 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -99,7 +99,7 @@ ynh_script_progression --message="Restoring PHP-FPM configuration..."
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index 78d1f6f..d2106cf 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -124,7 +124,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 
 #=================================================
 # PHP-FPM CONFIGURATION