diff --git a/README.md b/README.md index c9362e8..e9ad3d4 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ However, with a YesWiki we can build a website with multiple uses: * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 5ae264d..3bb304c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -39,7 +39,7 @@ Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multip * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs diff --git a/scripts/upgrade b/scripts/upgrade index a6e85f1..fb9ec35 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,13 +21,17 @@ upgrade_type=$(ynh_check_app_version_changed) if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --weight=5 + ynh_script_progression --message="Upgrading source files..." --weight=5 - # Download, check integrity, uncompress and patch the source from app.src - # TODO : find a way to sync stable extensions list to avoid hardcoded extensions folders to keep - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env wakka.config.php files custom private themes tools/accountactivationbyemail tools/advancedsearch tools/benevolat tools/ferme tools/fontautoinstall tools/ipblock tools/lms tools/login-sso tools/logincas tools/loginldap tools/maintenance tools/multideletepages tools/nextcloudconnector tools/publication tools/qrcode tools/stats tools/tabdyn tools/twolevels tools/webhooks" + # Download, check integrity, uncompress and patch the source from app.src + # TODO : find a way to sync stable extensions list to avoid hardcoded extensions folders to keep + ferme_instances="$(cd $install_dir; for p in $(ls -- */wakka.config.php 2>/dev/null); do dirname "$p"; done)" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env $ferme_instances wakka.config.php files custom private themes +tools/accountactivationbyemail tools/advancedsearch tools/benevolat tools/ferme tools/fontautoinstall tools/ipblock +tools/lms tools/login-sso tools/logincas tools/loginldap tools/maintenance tools/multideletepages +tools/nextcloudconnector tools/publication tools/qrcode tools/stats tools/tabdyn tools/twolevels tools/webhooks" - ynh_replace_string --match_string="yeswiki_release' \?=> \?'.*',$" --replace_string="yeswiki_release' => '$(ynh_app_upstream_version)'," --target_file="$install_dir/wakka.config.php" + ynh_replace_string --match_string="yeswiki_release' \?=> \?'.*',$" --replace_string="yeswiki_release' => '$(ynh_app_upstream_version)'," --target_file="$install_dir/wakka.config.php" fi chmod -R o-rwx "$install_dir"