diff --git a/README.md b/README.md index e0bd3bb..9f27d24 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Install Flarum with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=flarum) -[![Integration level](https://ci-apps.yunohost.org/ci/logs/flarum%20%28Apps%29.svg)](https://dash.yunohost.org/appci/app/flarum) [![Flarum version](https://img.shields.io/badge/flarum-0.1.0--beta.11-green.svg)](https://github.com/flarum/flarum/releases/tag/v0.1.0-beta.11) ![PHP version](https://img.shields.io/badge/php-7.3-green.svg) +[![Integration level](https://ci-apps.yunohost.org/ci/logs/flarum%20%28Apps%29.svg)](https://dash.yunohost.org/appci/app/flarum) [![Flarum version](https://img.shields.io/badge/flarum-0.1.0--beta.12-green.svg)](https://github.com/flarum/flarum/releases/tag/v0.1.0-beta.12) ![PHP version](https://img.shields.io/badge/php-7.3-green.svg) [Flarum](http://flarum.org/), an open-source forum software, packaged for [YunoHost](https://yunohost.org/), a self-hosting server operating server. @@ -43,7 +43,7 @@ Replace `vendor/extension` with the appropriate names. Read the extension docume app=flarum cd /var/www/$app sudo -u $app php7.3 composer.phar require vendor/extension -``` +``` ## Troubleshooting diff --git a/manifest.json b/manifest.json index 5d719ac..ffe22c0 100644 --- a/manifest.json +++ b/manifest.json @@ -3,13 +3,13 @@ "id": "flarum", "packaging_format": 1, "description": { - "en": "Flarum is the next-generation forum software that makes online discussion fun. It's simple, fast, and free.", - "fr": "Flarum est le forum de nouvelle génération qui rend les discussions ligne un plaisir. Il est simple, rapide, et libre.", - "de": "Flarum ist die Forensoftware der nächsten Generation, mit der Online-Diskussionen Spaß machen. Es ist einfach, schnell und freie." + "en": "Next-generation forum made simple.", + "fr": "Un forum de nouvelle génération, simplement.", + "de": "Forum der nächsten Generation leicht gemacht." }, "url": "http://flarum.org/", "license": "MIT", - "version": "0.1.0-beta.11~ynh1", + "version": "0.1.0-beta.12~ynh1", "maintainer": { "name": "tituspijean", "email": "tituspijean@outlook.com" diff --git a/scripts/_common.sh b/scripts/_common.sh index 78d5654..9f9df4a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,8 +7,8 @@ pkg_dependencies="php7.3-curl php7.3-dom php7.3-gd php7.3-json php7.3-mbstring p # Version numbers php_version="7.3" -project_version="0.1.0-beta.11" -core_version="0.1.0-beta.11" +project_version="0.1.0-beta.12" +core_version="0.1.0-beta.12" ssowat_version="0.1.0-beta.10-2" #================================================= diff --git a/scripts/ynh_add_extra_apt_repos__3 b/scripts/experimental_helpers/ynh_add_extra_apt_repos__3 similarity index 100% rename from scripts/ynh_add_extra_apt_repos__3 rename to scripts/experimental_helpers/ynh_add_extra_apt_repos__3 diff --git a/scripts/ynh_composer__2 b/scripts/experimental_helpers/ynh_composer__2 similarity index 100% rename from scripts/ynh_composer__2 rename to scripts/experimental_helpers/ynh_composer__2 diff --git a/scripts/ynh_exec_as b/scripts/experimental_helpers/ynh_exec_as similarity index 100% rename from scripts/ynh_exec_as rename to scripts/experimental_helpers/ynh_exec_as diff --git a/scripts/ynh_install_php__3 b/scripts/experimental_helpers/ynh_install_php__3 similarity index 100% rename from scripts/ynh_install_php__3 rename to scripts/experimental_helpers/ynh_install_php__3 diff --git a/scripts/ynh_send_readme_to_admin__2 b/scripts/experimental_helpers/ynh_send_readme_to_admin__2 similarity index 100% rename from scripts/ynh_send_readme_to_admin__2 rename to scripts/experimental_helpers/ynh_send_readme_to_admin__2 diff --git a/scripts/install b/scripts/install index 7e489cc..ff0fc21 100644 --- a/scripts/install +++ b/scripts/install @@ -7,11 +7,11 @@ #================================================= source _common.sh -source ynh_add_extra_apt_repos__3 -source ynh_install_php__3 -source ynh_exec_as -source ynh_composer__2 -source ynh_send_readme_to_admin__2 +source experimental_helpers/ynh_add_extra_apt_repos__3 +source experimental_helpers/ynh_install_php__3 +source experimental_helpers/ynh_exec_as +source experimental_helpers/ynh_composer__2 +source experimental_helpers/ynh_send_readme_to_admin__2 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index a3bd250..267cc8f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,8 +7,8 @@ #================================================= source _common.sh -source ynh_add_extra_apt_repos__3 -source ynh_install_php__3 +source experimental_helpers/ynh_add_extra_apt_repos__3 +source experimental_helpers/ynh_install_php__3 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index 98555d0..a7dba46 100644 --- a/scripts/restore +++ b/scripts/restore @@ -8,11 +8,11 @@ #Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh -source ../settings/scripts/ynh_add_extra_apt_repos__3 -source ../settings/scripts/ynh_install_php__3 -source ../settings/scripts/ynh_exec_as -source ../settings/scripts/ynh_composer__2 -source ../settings/scripts/ynh_send_readme_to_admin__2 +source ../settings/scripts/experimental_helpers/ynh_add_extra_apt_repos__3 +source ../settings/scripts/experimental_helpers/ynh_install_php__3 +source ../settings/scripts/experimental_helpers/ynh_exec_as +source ../settings/scripts/experimental_helpers/ynh_composer__2 +source ../settings/scripts/experimental_helpers/ynh_send_readme_to_admin__2 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 569b150..25d2717 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,11 +7,11 @@ #================================================= source _common.sh -source ynh_add_extra_apt_repos__3 -source ynh_install_php__3 -source ynh_exec_as -source ynh_composer__2 -source ynh_send_readme_to_admin__2 +source experimental_helpers/ynh_add_extra_apt_repos__3 +source experimental_helpers/ynh_install_php__3 +source experimental_helpers/ynh_exec_as +source experimental_helpers/ynh_composer__2 +source experimental_helpers/ynh_send_readme_to_admin__2 source /usr/share/yunohost/helpers #=================================================