Merge pull request #166 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

README.md

@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption.
 
-**Shipped version:** 1.11.66~ynh1
+**Shipped version:** 1.11.67~ynh1
 
 **Demo:** <https://app.element.io/>
 

README_es.md

@@ -0,0 +1,49 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Element para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/element.svg)](https://dash.yunohost.org/appci/app/element) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/element.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/element.maintain.svg)
+
+[![Instalar Element con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=element)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarElement rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption.
+
+**Versión actual:** 1.11.67~ynh1
+
+**Demo:** <https://app.element.io/>
+
+## Capturas
+
+![Captura de Element](./doc/screenshots/homepage-all-platforms-1_1.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://element.io>
+- Documentación administrador oficial: <https://element.io/help>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/element-hq/element-web>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/element>
+- Reportar un error: <https://github.com/YunoHost-Apps/element_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/element_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/element_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade element -u https://github.com/YunoHost-Apps/element_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption.
 
-**Paketatutako bertsioa:** 1.11.66~ynh1
+**Paketatutako bertsioa:** 1.11.67~ynh1
 
 **Demoa:** <https://app.element.io/>
 

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Element est un nouveau type d'application de messagerie. Vous choisissez où vos messages sont stockés, ce qui vous donne le contrôle de vos données. Il vous donne accès au réseau ouvert Matrix, vous pouvez donc parler à n'importe qui. Element offre un nouveau niveau de sécurité, en ajoutant la vérification des appareils par signature croisée au chiffrement de bout en bout par défaut. 
 
-**Version incluse :** 1.11.66~ynh1
+**Version incluse :** 1.11.67~ynh1
 
 **Démo :** <https://app.element.io/>
 

README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption.
 
-**Versión proporcionada:** 1.11.66~ynh1
+**Versión proporcionada:** 1.11.67~ynh1
 
 **Demo:** <https://app.element.io/>
 

README_zh_Hans.md

@@ -18,7 +18,7 @@
 
 Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption.
 
-**分发版本：** 1.11.66~ynh1
+**分发版本：** 1.11.67~ynh1
 
 **演示：** <https://app.element.io/>
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Element"
 description.en = "Web client for Matrix"
 description.fr = "Client web pour Matrix"
 
-version = "1.11.66~ynh1"
+version = "1.11.67~ynh1"
 
 maintainers = ["Josué Tille"]
 
@@ -56,8 +56,8 @@ ram.runtime = "0M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/element-hq/element-web/releases/download/v1.11.66/element-v1.11.66.tar.gz"
-        sha256 = "4bab7bf011f650a94f2bc0a6e8f0f0cb7fe59975f3cced1cb270c47419169c37"
+        url = "https://github.com/element-hq/element-web/releases/download/v1.11.67/element-v1.11.67.tar.gz"
+        sha256 = "fb0eaf04eb26175db39f9436b772e01e1e5e2095e403dc0df0385e5256bf01e5"
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset = "^element-v.*.tar.gz$"
 

scripts/restore

@@ -26,13 +26,6 @@ ynh_script_progression --message="Restoring system configurations related to $ap
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
-
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================

scripts/upgrade

@@ -9,12 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -68,14 +62,10 @@ fi
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.json"
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.json"
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"