From ea64561fe4cf4ba80d64a3c79a3163361f012916 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 23 Mar 2021 20:20:44 +0100
Subject: [PATCH] ynh_exec_warn_less

---
 scripts/install | 30 +++++++++++++++---------------
 scripts/upgrade | 16 ++++++++--------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/scripts/install b/scripts/install
index a89188b..80ffac9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -150,22 +150,22 @@ chown -R $app: $final_path
 update-alternatives --set php /usr/bin/php$phpversion
 
 pushd "$final_path"    
-	sudo -u $app env PATH=$PATH drush pm-download -y drupal-7 --drupal-project-rename=$app
+	ynh_exec_warn_less sudo -u $app env PATH=$PATH drush pm-download -y drupal-7 --drupal-project-rename=$app
 popd
 
-sudo -u $app env PATH=$PATH drush @$app site-install $install_profil --account-name=$admin --account-pass=$password --account-mail=$admin_mail --db-url=mysql://$db_user:$db_pwd@localhost/$db_name --site-name="$app" --locale=$language --yes
-sudo -u $app env PATH=$PATH drush @$app pm-download drush_language
-#sudo -u $app env PATH=$PATH drush @$app pm-download ldap
-#sudo -u $app env PATH=$PATH drush @$app pm-enable -y ldap_servers ldap_user ldap_authentication ldap_authorization ldap_authorization_drupal_role
-sudo -u $app env PATH=$PATH drush @$app pm-download l10n_update
-sudo -u $app env PATH=$PATH drush @$app pm-enable -y l10n_update
-sudo -u $app env PATH=$PATH drush @$app language-add $language
-sudo -u $app env PATH=$PATH drush @$app language-default $language
-sudo -u $app env PATH=$PATH drush @$app cache-clear drush
-sudo -u $app env PATH=$PATH drush @$app l10n-update-refresh
-sudo -u $app env PATH=$PATH drush @$app l10n-update
-sudo -u $app env PATH=$PATH drush @$app pm-update
-sudo -u $app env PATH=$PATH drush @$app core-cron
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app site-install $install_profil --account-name=$admin --account-pass=$password --account-mail=$admin_mail --db-url=mysql://$db_user:$db_pwd@localhost/$db_name --site-name="$app" --locale=$language --yes
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app pm-download drush_language
+#ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app pm-download ldap
+#ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app pm-enable -y ldap_servers ldap_user ldap_authentication ldap_authorization ldap_authorization_drupal_role
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app pm-download l10n_update
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app pm-enable -y l10n_update
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app language-add $language
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app language-default $language
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app cache-clear drush
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app l10n-update-refresh
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app l10n-update
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app pm-update
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app core-cron
 
 ynh_setup_source --dest_dir="$final_path/$app/sites/all/modules/civicrm" --source_id="civicrm-drupal"
 ynh_setup_source --dest_dir="$final_path/$app/sites/all/modules/civicrm" --source_id="civicrm-l10n"
@@ -173,7 +173,7 @@ ynh_setup_source --dest_dir="$final_path/$app/sites/all/modules/civicrm" --sourc
 chown -R $app: $final_path
 chmod 755 $final_path/$app/sites/default/
 
-sudo -u $app env PATH=$PATH drush --include="$final_path/$app/sites/all/modules/civicrm/drupal/drush" @$app civicrm-install --dbhost="localhost" --dbname="$db_name" --dbpass="$db_pwd" --dbuser="$db_user" --destination="sites/all/modules" --site_url="$domain$path_url" --ssl=on
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush --include="$final_path/$app/sites/all/modules/civicrm/drupal/drush" @$app civicrm-install --dbhost="localhost" --dbname="$db_name" --dbpass="$db_pwd" --dbuser="$db_user" --destination="sites/all/modules" --site_url="$domain$path_url" --ssl=on
 
 update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION}
 
diff --git a/scripts/upgrade b/scripts/upgrade
index c831182..c2b38d3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -120,18 +120,18 @@ export PATH="$final_path/.composer/vendor/bin:$PATH"
 
 update-alternatives --set php /usr/bin/php$phpversion
 
-sudo -u $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 1 
-sudo -u $app env PATH=$PATH drush @$app cache-clear all 
-sudo -u $app env PATH=$PATH drush @$app pm-update -y drupal
-sudo -u $app env PATH=$PATH drush @$app cache-clear all 
-sudo -u $app env PATH=$PATH drush @$app l10n-update-refresh
-sudo -u $app env PATH=$PATH drush @$app l10n-update
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 1 
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app cache-clear all 
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app pm-update -y drupal
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app cache-clear all 
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app l10n-update-refresh
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app l10n-update
 
 ynh_setup_source --dest_dir="$final_path/$app/sites/all/modules/civicrm" --source_id="civicrm-drupal"
 ynh_setup_source --dest_dir="$final_path/$app/sites/all/modules/civicrm" --source_id="civicrm-l10n"
-sudo -u $app env PATH=$PATH drush --include="$final_path/$app/sites/all/modules/civicrm/drupal/drush" @$app -y civicrm-upgrade-db
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush --include="$final_path/$app/sites/all/modules/civicrm/drupal/drush" @$app -y civicrm-upgrade-db
 
-sudo -u $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 0
+ynh_exec_warn_less sudo -u $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 0
 
 update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION}