diff --git a/scripts/_common.sh b/scripts/_common.sh index 0307809..43e79e2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,6 +12,12 @@ swap_needed=512 # PERSONAL HELPERS #================================================= +_ynh_exec_with_drush_php() { + ynh_exec_warn_less ynh_exec_as "$app" \ + env PATH="$PATH" DRUSH_PHP="/usr/bin/php$phpversion" \ + "$@" +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index e435286..f11c405 100644 --- a/scripts/install +++ b/scripts/install @@ -80,20 +80,17 @@ chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" pushd "$install_dir" - ynh_exec_warn_less ynh_exec_as $app \ - env PATH=$PATH \ - drush site:install $install_profil \ - --account-name=$admin \ - --account-pass=$password \ - --account-mail=$admin_mail \ - --db-url=mysql://$db_user:$db_pwd@localhost/$db_name \ + _ynh_exec_with_drush_php \ + drush 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 popd -update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} - #================================================= # SETUP THE CRON FILE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3f6e5e6..ea6743d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -75,19 +75,15 @@ ynh_backup_if_checksum_is_different --file="$install_dir/$app/sites/default/sett chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" -update-alternatives --set php /usr/bin/php$phpversion - pushd "$install_dir" - ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH drush @$app.prod state:set system.maintenance_mode 1 --input-format=integer - ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH php composer.phar update drupal/core webflo/drupal-core-require-dev --with-dependencies - ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH php composer.phar update --with-dependencies - ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH drush @$app.prod -y updatedb - ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH drush @$app.prod cache:rebuild - ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH drush @$app.prod state:set system.maintenance_mode 0 --input-format=integer + _ynh_exec_with_drush_php drush "@$app.prod" state:set system.maintenance_mode 1 --input-format=integer + _ynh_exec_with_drush_php php composer.phar update drupal/core webflo/drupal-core-require-dev --with-dependencies + _ynh_exec_with_drush_php php composer.phar update --with-dependencies + _ynh_exec_with_drush_php drush "@$app.prod" -y updatedb + _ynh_exec_with_drush_php drush "@$app.prod" cache:rebuild + _ynh_exec_with_drush_php drush "@$app.prod" state:set system.maintenance_mode 0 --input-format=integer popd -update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} - #================================================= # STORE THE CONFIG FILE CHECKSUM #=================================================