YunoHost-Apps/flarum_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/flarum_ynh.git synced 2024-09-03 18:36:24 +02:00
Code Issues Activity Actions

Merge pull request #178 from YunoHost-Apps/testing

Browse source 
Fix ynh_composer_exec syntax and upgrade to v1.1.1
This commit is contained in:
tituspijean 2021-11-12 11:28:07 +01:00 • committed by GitHub
commit 743b1bfb0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community. Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community.
**Shipped version:** 1.0.0~ynh6 **Shipped version:** 1.1.1~ynh1
**Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum

2
README_fr.md
View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté. Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté.
**Version incluse :** 1.0.0~ynh6 **Version incluse :** 1.1.1~ynh1
**Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum

4
check_process
View file

@ -19,6 +19,7 @@
# upgrade=1 from_commit=0d30809a2903544a660635f62a25bc6057ea2f15 # upgrade=1 from_commit=0d30809a2903544a660635f62a25bc6057ea2f15
# upgrade=1 from_commit=0175b7a3b0a551e14f39c65290d194ccc71cd6ee # upgrade=1 from_commit=0175b7a3b0a551e14f39c65290d194ccc71cd6ee
# upgrade=1 from_commit=70e962faa875070b0fcc29f45cc70e2a51de76a6 # upgrade=1 from_commit=70e962faa875070b0fcc29f45cc70e2a51de76a6
upgrade=1 from_commit=b6a29ea2bb4c3d2b5aa2dd786d12b72844e88929
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
port_already_use=0 port_already_use=0
@ -36,3 +37,6 @@ Notification=none
; commit=70e962faa875070b0fcc29f45cc70e2a51de76a6 ; commit=70e962faa875070b0fcc29f45cc70e2a51de76a6
name=2021-05-06 0.1.0.16~ynh2 name=2021-05-06 0.1.0.16~ynh2
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=PASSWORD&language=fr&is_public=1&title=Forum& manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=PASSWORD&language=fr&is_public=1&title=Forum&
; commit=b6a29ea2bb4c3d2b5aa2dd786d12b72844e88929
name=2021-11-12 fixed 1.0
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=PASSWORD&language=fr&is_public=1&title=Forum&

7
manifest.json
View file

@ -7,7 +7,7 @@
"fr": "Forum de nouvelle génération, simplement", "fr": "Forum de nouvelle génération, simplement",
"de": "Forum der nächsten Generation leicht gemacht" "de": "Forum der nächsten Generation leicht gemacht"
}, },
"version": "1.0.0~ynh6", "version": "1.1.1~ynh1",
"url": "http://flarum.org/", "url": "http://flarum.org/",
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",
@ -22,7 +22,7 @@
"email": "tituspijean@outlook.com" "email": "tituspijean@outlook.com"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.0" "yunohost": ">= 4.3.2"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -60,8 +60,7 @@
"help": { "help": {
"en": "Choose your password. It will be useful if logging in from YunoHost fails or is disrupted.", "en": "Choose your password. It will be useful if logging in from YunoHost fails or is disrupted.",
"fr": "Choisissez votre mot de passe. Il sera utile si la connexion via YunoHost échoue ou est perturbée." "fr": "Choisissez votre mot de passe. Il sera utile si la connexion via YunoHost échoue ou est perturbée."
}, }
"example": "Choose a password"
}, },
{ {
"name": "title", "name": "title",

4
scripts/_common.sh
View file

@ -14,8 +14,8 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php
# Version numbers # Version numbers
project_version="~1.0.0" project_version="~1.0.0"
core_version="~1.0.0" #core_version is now retrieved from the manifest
ldap_version="~1.0.0-p1" ldap_version="*"
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

25
scripts/install
View file

@ -31,6 +31,7 @@ admin_pwd=$YNH_APP_ARG_PASSWORD
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
language=$YNH_APP_ARG_LANGUAGE language=$YNH_APP_ARG_LANGUAGE
title=$YNH_APP_ARG_TITLE title=$YNH_APP_ARG_TITLE
core_version=$(ynh_app_upstream_version)
admin_mail=$(ynh_user_get_info --username=$admin --key=mail) admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
@ -52,13 +53,13 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
#================================================= #=================================================
ynh_script_progression --message="Storing installation settings..." ynh_script_progression --message="Storing installation settings..."
ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=domain --value="$domain"
ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=path --value="$path_url"
ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=admin --value="$admin"
ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=language --value="$language"
ynh_app_setting_set --app=$app --key=project_version --value=$project_version ynh_app_setting_set --app=$app --key=project_version --value="$project_version"
ynh_app_setting_set --app=$app --key=core_version --value=$core_version ynh_app_setting_set --app=$app --key=core_version --value="$core_version"
ynh_app_setting_set --app=$app --key=ldap_version --value=$ldap_version ynh_app_setting_set --app=$app --key=ldap_version --value="$ldap_version"
#================================================= #=================================================
# STANDARD MODIFICATIONS # STANDARD MODIFICATIONS
@ -135,13 +136,13 @@ ynh_script_progression --message="Installing composer dependencies..." --weight=
ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
# Set Flarum version # Set Flarum version
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require flarum/core:$core_version --prefer-lowest --no-update\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require flarum/core:$core_version --prefer-lowest --no-update"
# Require LDAP extension # Require LDAP extension
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require tituspijean/flarum-ext-auth-ldap:$ldap_version --no-update\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require tituspijean/flarum-ext-auth-ldap:$ldap_version --no-update"
# Update and download dependencies # Update and download dependencies
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"update\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="update"
#================================================= #=================================================
# FLARUM POST-INSTALL # FLARUM POST-INSTALL
@ -172,14 +173,14 @@ ynh_mysql_connect_as --user=$app --password="$db_pwd" --database=$db_name < ../c
case $language in case $language in
fr) fr)
ynh_script_progression --message="Installing French extension..." --weight=2 ynh_script_progression --message="Installing French extension..." --weight=2
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require qiaeru/lang-french:^2.0.0"
activate_flarum_extension $db_name "qiaeru-lang-french" activate_flarum_extension $db_name "qiaeru-lang-french"
sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'" sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'"
ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name
;; ;;
de) de)
ynh_script_progression --message="Installing German extension..." --weight=2 ynh_script_progression --message="Installing German extension..." --weight=2
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require kakifrucht/flarum-de:^1.0.0"
activate_flarum_extension $db_name "kakifrucht-de" activate_flarum_extension $db_name "kakifrucht-de"
sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'" sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'"
ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name

26
scripts/upgrade
View file

@ -26,6 +26,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
old_project_version=$(ynh_app_setting_get --app=$app --key=project_version) old_project_version=$(ynh_app_setting_get --app=$app --key=project_version)
old_core_version=$(ynh_app_setting_get --app=$app --key=core_version) old_core_version=$(ynh_app_setting_get --app=$app --key=core_version)
core_version=$(ynh_app_upstream_version)
old_ldap_version=$(ynh_app_setting_get --app=$app --key=ldap_version) old_ldap_version=$(ynh_app_setting_get --app=$app --key=ldap_version)
#================================================= #=================================================
@ -84,10 +85,10 @@ if [ ! -z "$bazaar_extension" ]; then
ynh_app_setting_delete --app=$app --key=bazaar_extension ynh_app_setting_delete --app=$app --key=bazaar_extension
fi fi
# Remove SSOwat if it exists # Remove SSOwat extension if it exists
ssowat_extension=$(ynh_app_setting_get --app=$app --key=ssowat_extension) ssowat_extension=$(ynh_app_setting_get --app=$app --key=ssowat_extension)
if [ ! -z "$ssowat_extension" ]; then if [ ! -z "$ssowat_extension" ]; then
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"remove tituspijean/flarum-ext-auth-ssowat\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="remove tituspijean/flarum-ext-auth-ssowat"
ynh_app_setting_delete --app=$app --key=ssowat_extension ynh_app_setting_delete --app=$app --key=ssowat_extension
fi fi
@ -183,11 +184,18 @@ then
# Install Composer and Flarum # Install Composer and Flarum
ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$final_path ynh_exec_warn_less ynh_install_composer --phpversion=$phpversion --workdir=$final_path
if ynh_compare_current_package_version --comparison lt --version 1.1.0~ynh1
then
# Starting 1.0 (implemented for 1.1 in the package), version requirement is "*" for extensions
# ... except for flarum/core, but that's handled in the next block.
jq '.require | .[] = "*"' $final_path/composer.json
fi
# Perform migrations and clear cache # Perform migrations and clear cache
pushd $final_path pushd $final_path
ynh_script_progression --message="Upgrading Flarum and its extensions..." --weight=1 ynh_script_progression --message="Upgrading Flarum and its extensions..." --weight=1
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require tituspijean/flarum-ext-auth-ldap:$ldap_version --no-update\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require tituspijean/flarum-ext-auth-ldap:$ldap_version --no-update"
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require flarum/core:$core_version --prefer-dist --update-no-dev -a --update-with-all-dependencies\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require flarum/core:$core_version --prefer-dist --update-no-dev -a --update-with-all-dependencies"
ynh_exec_as $app php$phpversion flarum migrate ynh_exec_as $app php$phpversion flarum migrate
ynh_exec_as $app php$phpversion flarum cache:clear ynh_exec_as $app php$phpversion flarum cache:clear
popd popd
@ -210,14 +218,14 @@ fi
case $language in case $language in
fr) fr)
ynh_script_progression --message="Installing French extension..." --weight=2 ynh_script_progression --message="Installing French extension..." --weight=2
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require qiaeru/lang-french:*"
activate_flarum_extension $db_name "qiaeru-lang-french" activate_flarum_extension $db_name "qiaeru-lang-french"
sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'" sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'"
ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name
;; ;;
de) de)
ynh_script_progression --message="Installing German extension..." --weight=2 ynh_script_progression --message="Installing German extension..." --weight=2
ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0\" ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require kakifrucht/flarum-de:*"
activate_flarum_extension $db_name "kakifrucht-de" activate_flarum_extension $db_name "kakifrucht-de"
sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'" sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'"
ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name
@ -232,9 +240,9 @@ pushd $final_path
popd popd
# Save version settings # Save version settings
ynh_app_setting_set $app project_version $project_version ynh_app_setting_set $app project_version "$project_version"
ynh_app_setting_set $app core_version $core_version ynh_app_setting_set $app core_version "$core_version"
ynh_app_setting_set $app ldap_version $ldap_version ynh_app_setting_set $app ldap_version "$ldap_version"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION