Merge pull request #37 from YunoHost-Apps/upgrade_full_replace

[autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1

README.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -19,21 +19,20 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Elasticsearch is the distributed, RESTful search and analytics engine at the heart of the [Elastic Stack](https://www.elastic.co/products). You can use Elasticsearch to store, search, and manage data for logs, metrics, search backend, application monitoring, Endpoint security.
 To learn more about Elasticsearch’s features and capabilities, see the [product page](https://www.elastic.co/products/elasticsearch).
 
+**Shipped version:** 8.11.1~ynh3
 
-**Shipped version:** 8.11.1~ynh2
+**Demo:** <https://www.elastic.co/demos>
-
-**Demo:** https://www.elastic.co/demos
 ## :red_circle: Antifeatures
 
 - **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use.
 
 ## Documentation and resources
 
-* Official app website: <https://elastic.co>
+- Official app website: <https://elastic.co>
-* Official admin documentation: <https://www.elastic.co/guide/en/elasticsearch/reference/8.11/elasticsearch-intro.html>
+- Official admin documentation: <https://www.elastic.co/guide/en/elasticsearch/reference/8.11/elasticsearch-intro.html>
-* Upstream app code repository: <https://github.com/elastic/elasticsearch>
+- Upstream app code repository: <https://github.com/elastic/elasticsearch>
-* YunoHost Store: <https://apps.yunohost.org/app/elasticsearch8>
+- YunoHost Store: <https://apps.yunohost.org/app/elasticsearch8>
-* Report a bug: <https://github.com/YunoHost-Apps/elasticsearch8_ynh/issues>
+- Report a bug: <https://github.com/YunoHost-Apps/elasticsearch8_ynh/issues>
 
 ## Developer info
 
@@ -41,7 +40,7 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos
 
 To try the testing branch, please proceed like that.
 
-``` bash
+```bash
 sudo yunohost app install https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade elasticsearch8 -u https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug

README_fr.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -18,21 +18,20 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Elasticsearch est le moteur de recherche et d'analyse distribué et RESTful au cœur de la [Elastic Stack](https://www.elastic.co/products). Vous pouvez utiliser Elasticsearch pour stocker, rechercher et gérer des données pour les journaux, les métriques, le backend de recherche, la surveillance des applications et la sécurité des points de terminaison.
 Pour en savoir plus sur les fonctionnalités et capacités d'Elasticsearch, consultez la [page produit](https://www.elastic.co/products/elasticsearch).
+**Version incluse :** 8.11.1~ynh3
 
-**Version incluse :** 8.11.1~ynh2
+**Démo :** <https://www.elastic.co/demos>
+## :red_circle: Anti-fonctionnalités
 
-**Démo :** https://www.elastic.co/demos
+- **Application sous licence libre restreinte** : L'application packagée est sous une licence globalement libre, mais avec des clauses qui pourraient restreindre son utilisation.
-## :red_circle: Fonctions indésirables
-
-- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use.
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://elastic.co>
+- Site officiel de l’app : <https://elastic.co>
-* Documentation officielle de l’admin : <https://www.elastic.co/guide/en/elasticsearch/reference/8.11/elasticsearch-intro.html>
+- Documentation officielle de l’admin : <https://www.elastic.co/guide/en/elasticsearch/reference/8.11/elasticsearch-intro.html>
-* Dépôt de code officiel de l’app : <https://github.com/elastic/elasticsearch>
+- Dépôt de code officiel de l’app : <https://github.com/elastic/elasticsearch>
-* YunoHost Store: <https://apps.yunohost.org/app/elasticsearch8>
+- YunoHost Store : <https://apps.yunohost.org/app/elasticsearch8>
-* Signaler un bug : <https://github.com/YunoHost-Apps/elasticsearch8_ynh/issues>
+- Signaler un bug : <https://github.com/YunoHost-Apps/elasticsearch8_ynh/issues>
 
 ## Informations pour les développeurs
 
@@ -40,7 +39,7 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno
 
 Pour essayer la branche testing, procédez comme suit.
 
-``` bash
+```bash
 sudo yunohost app install https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade elasticsearch8 -u https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug

manifest.toml

@@ -5,7 +5,7 @@ name = "ElasticSearch 8"
 description.en = "Distributed and RESTful search engine"
 description.fr = "Moteur de recherche RESTful"
 
-version = "8.11.1~ynh2"
+version = "8.11.1~ynh3"
 
 maintainers = ["fflorent"]
 

scripts/upgrade

@@ -38,7 +38,9 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=20
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir"  --keep="config/elasticsearch.yml config/jvm.options.d/yunohost.conf"
+	# The keep option prevents this warning:
+	#   "File .... has been manually modified since the installation or last upgrade."
+	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config/elasticsearch.yml"
 fi
 
 chmod -R o-rwx "$install_dir"