From 85bec9d21359c359e03aa846ed771ada8e4f39b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 21 Dec 2023 14:31:57 +0100 Subject: [PATCH] change name --- manifest.toml | 6 +++--- scripts/upgrade | 42 ------------------------------------------ 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/manifest.toml b/manifest.toml index cfd78cf..1250a26 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,7 +1,7 @@ packaging_format = 2 -id = "framaforms" -name = "Framaforms" +id = "yakforms" +name = "YakForms" description.en = "Create online webforms and surveys" description.fr = "Créez des formulaires et questionnaires en ligne" @@ -85,7 +85,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "postgresql, curl, libzip-dev, php7.4-fpm, php7.4-cli, php7.4-gd, php7.4-mysql, php7.4-xml, php7.4-ldap, php7.4-mbstring, php7.4-pgsql" + packages = "postgresql, curl, libzip-dev, php8.2-cli, php8.2-gd, php8.2-xml, php8.2-ldap, php8.2-mbstring, php8.2-pgsql" [resources.database] type = "postgresql" diff --git a/scripts/upgrade b/scripts/upgrade index 5e481fb..35be3d1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,29 +39,6 @@ ynh_add_fpm_config ynh_add_nginx_config -#================================================= -# Framaforms 2 Yakforms Backup -#================================================= - -if [ "$upgrade_to_yakforms" = false ] -then - update-alternatives --set php /usr/bin/php$phpversion - upgrade_to_yakforms=true - - pushd "$install_dir" - ynh_exec_as $app env PATH=$PATH php framaforms2yakforms.php backup - ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms - ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms - ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms_share_results - ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms_share_results - ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms_public_results - ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms_public_results - ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms_spam - ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms_spam - popd - update-alternatives --set php /usr/bin/php${YNH_PHP_VERSION} -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -86,25 +63,6 @@ ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.compose export PATH="$install_dir/.composer/vendor/bin:$PATH" -#================================================= -# Framaforms 2 Yakforms Restore -#================================================= - -if [ "$upgrade_to_yakforms" = true ] -then - update-alternatives --set php /usr/bin/php$phpversion - - pushd "$install_dir" - ynh_exec_as $app env PATH=$PATH drush @$app en yakforms - ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_share_results - ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_public_results - ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_spam - ynh_exec_as $app env PATH=$PATH php framaforms2yakforms.php restore - ynh_exec_as $app env PATH=$PATH php framaforms2yakforms.php clean - popd - update-alternatives --set php /usr/bin/php${YNH_PHP_VERSION} -fi - #================================================= # UPGRADE DRUPAL #=================================================