Merge branch 'testing' into keep-config

README.md

@@ -1,57 +1,42 @@
+<!--
+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.
+-->
+
 # Searx for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/searx.svg)](https://dash.yunohost.org/appci/app/searx) ![](https://ci-apps.yunohost.org/ci/badges/searx.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/searx.maintain.svg)  
 [![Install Searx with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=searx)
 
-> *This package allow you to install Searx quickly and simply on a YunoHost server.  
+*[Lire ce readme en français.](./README_fr.md)*
-If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.*
+
+> *This package allows you to install Searx quickly and simply on a YunoHost server.
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
-Searx is a privacy-respecting, hackable metasearch engine.
 
-**Shipped version:** 1.0.0
+Privacy-respecting, hackable metasearch engine
 
-## Screenshot
+**Shipped version:** 1.0.0~ynh2
 
-![](Screenshot.png)
+**Demo:** https://demo.yunohost.org/searx/
 
-## Demo
+## Screenshots
 
-* [YunoHost demo](https://demo.yunohost.org/searx/)
+![](./doc/screenshots/Screenshot.png)
 
-## Configuration
+## Documentation and resources
 
-## Documentation
+* Official app website: https://searx.github.io/searx/
+* Official user documentation: https://yunohost.org/apps
+* Official admin documentation: https://github.com/searx/searx/wiki
+* Upstream app code repository: https://github.com/searx/searx
+* YunoHost documentation for this app: https://yunohost.org/app_searx
+* Report a bug: https://github.com/YunoHost-Apps/searx_ynh/issues
 
- * Official documentation: https://github.com/searx/searx/wiki
+## Developer info
 
-## YunoHost specific features
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/searx_ynh/tree/testing).
-
-#### Multi-users support
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/searx.svg)](https://ci-apps.yunohost.org/ci/apps/searx/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/searx.svg)](https://ci-apps-arm.yunohost.org/ci/apps/searx/)
-
-## Limitations
-
-## Additional information
-
-- [Search syntax](https://searx.github.io/searx/user/search_syntax.html)
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/searx_ynh/issues
- * Searx website: https://searx.github.io/searx/
- * Searx repository: https://github.com/searx/searx
- * YunoHost website: https://yunohost.org/
-
----
-
-## Developers info
-
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/searx_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
@@ -59,3 +44,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/searx_ynh/tree/testin
 or
 sudo yunohost app upgrade searx -u https://github.com/YunoHost-Apps/searx_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps

README_fr.md

@@ -0,0 +1,44 @@
+# Searx pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/searx.svg)](https://dash.yunohost.org/appci/app/searx) ![](https://ci-apps.yunohost.org/ci/badges/searx.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/searx.maintain.svg)  
+[![Installer Searx avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=searx)
+
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *Ce package vous permet d'installer Searx rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+
+## Vue d'ensemble
+
+Méta-moteur de recherche respectueux de la vie privée et bidouillable
+
+**Version incluse :** 1.0.0~ynh2
+
+**Démo :** https://demo.yunohost.org/searx/
+
+## Captures d'écran
+
+![](./doc/screenshots/Screenshot.png)
+
+## Documentations et ressources
+
+* Site officiel de l'app : https://searx.github.io/searx/
+* Documentation officielle utilisateur : https://yunohost.org/apps
+* Documentation officielle de l'admin : https://github.com/searx/searx/wiki
+* Dépôt de code officiel de l'app : https://github.com/searx/searx
+* Documentation YunoHost pour cette app : https://yunohost.org/app_searx
+* Signaler un bug : https://github.com/YunoHost-Apps/searx_ynh/issues
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/searx_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/searx_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade searx -u https://github.com/YunoHost-Apps/searx_ynh/tree/testing --debug
+```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps

check_process

@@ -11,7 +11,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=8843877c494c6b47edf2846cb6f1664e4404815c
+		upgrade=1	from_commit=24d48bd0e1268cae80a496855dbd9d404cd555ca
 		backup_restore=1
 		multi_instance=0
 		change_url=1
@@ -19,6 +19,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=8843877c494c6b47edf2846cb6f1664e4404815c
+	; commit=24d48bd0e1268cae80a496855dbd9d404cd555ca
-		name=Fix Merge pull request #57 from YunoHost-Apps/16
+		name=Merge pull request #84
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&

manifest.json

@@ -9,6 +9,14 @@
 	},
 	"version": "1.0.0~ynh2",
 	"url": "https://searx.github.io/searx/",
+	"upstream": {
+        "license": "AGPL-3.0-or-later",
+        "website": "https://searx.github.io/searx/",
+        "demo": "https://demo.yunohost.org/searx/",
+        "admindoc": "https://github.com/searx/searx/wiki",
+        "userdoc": "https://yunohost.org/apps",
+        "code": "https://github.com/searx/searx"
+    },
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {
 		"name": "opi",