From 909e1bb0b6d8baf81d25ed85dcc1779f85fcea43 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 11 Mar 2022 11:37:15 +0100 Subject: [PATCH 1/5] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 09becbe..7f2ad20 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mybb/mybb/releases/download/mybb_1829/mybb_1829.zip -SOURCE_SUM=446f0276ce2c63a83e07cea8429ba2ecd304a5f764d9676927eb022c75cb4998 +SOURCE_URL=https://github.com/mybb/mybb/releases/download/mybb_1830/mybb_1830.zip +SOURCE_SUM=9ef240c451b4c324d4b9d5201e1c28a49e5bbccf7f8b6bcade115375b933bc2f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false From ca8ece9257c0f790f9043573ba22ff3c829f4132 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 11 Mar 2022 11:38:20 +0100 Subject: [PATCH 2/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 5b1a773..05805b5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Forum software", "fr": "Forum open source et libre" }, - "version": "1.8.29~ynh2", + "version": "1.8.30~ynh1", "url": "https://mybb.com/", "upstream": { "license": "LGPL-3.0-only", From f105f69574d90a740fc01653abcb6e93c46663b7 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 11 Mar 2022 10:38:25 +0000 Subject: [PATCH 3/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57b5bed..2b4ce03 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in MyBB is the free and open source forum software powering thousands of engaging, vibrant, and unique communities across the internet. -**Shipped version:** 1.8.29~ynh2 +**Shipped version:** 1.8.30~ynh1 **Demo:** https://demomybb.tk/ diff --git a/README_fr.md b/README_fr.md index 64324e6..05046a4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour MyBB is the free and open source forum software powering thousands of engaging, vibrant, and unique communities across the internet. -**Version incluse :** 1.8.29~ynh2 +**Version incluse :** 1.8.30~ynh1 **Démo :** https://demomybb.tk/ From b46909c34c66c6bed8e726126c03c2a14d277b75 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Mar 2022 18:40:42 +0100 Subject: [PATCH 4/5] pkg_dependencies --- scripts/_common.sh | 2 +- scripts/install | 9 ++++++++- scripts/remove | 8 ++++++++ scripts/restore | 12 +++++++++++- scripts/upgrade | 7 +++++++ 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 0e2d6e9..db71a7d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml" +pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 9bacf81..2532de0 100755 --- a/scripts/install +++ b/scripts/install @@ -49,6 +49,13 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url +#================================================= +# INSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Installing dependencies..." --weight=2 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # CREATE DEDICATED USER #================================================= @@ -99,7 +106,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/remove b/scripts/remove index 77c378d..1e75075 100755 --- a/scripts/remove +++ b/scripts/remove @@ -53,6 +53,14 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --weight=2 + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index f4a076a..12f2012 100755 --- a/scripts/restore +++ b/scripts/restore @@ -74,7 +74,17 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config + +#================================================= +# SPECIFIC RESTORATION +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=1 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 04518e3..1ea7966 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -100,6 +100,13 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=2 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # PHP-FPM CONFIGURATION #================================================= From 2bdfc9fea0b7a93775e073c53150897f5c2a1ac5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Mar 2022 18:12:38 +0100 Subject: [PATCH 5/5] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1ea7966..269d51b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -113,7 +113,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config #================================================= # RELOAD NGINX