Merge pull request #19 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)
+- [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
-- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -9,7 +9,7 @@ It shall NOT be edited by hand.
 
 [![Install Ergo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ergo)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Ergo 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.*
@@ -27,7 +27,7 @@ Ergo (formerly known as Oragono) is a modern IRC server written in Go. Its core
 
 
 
-**Shipped version:** 2.13.0~ynh1
+**Shipped version:** 2.13.1~ynh1
 
 **Demo:** <https://testnet.ergo.chat/>
 

README_eu.md

@@ -0,0 +1,59 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Ergo YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/ergo.svg)](https://dash.yunohost.org/appci/app/ergo) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/ergo.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/ergo.maintain.svg)
+
+[![Instalatu Ergo YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ergo)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Ergo YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Ergo (formerly known as Oragono) is a modern IRC server written in Go. Its core design 
+
+### Features
+
+- Being simple to set up and use
+- Combining the features of an ircd, a services framework, and a bouncer (integrated account management, history storage, and bouncer functionality)
+- Bleeding-edge IRCv3 support, suitable for use as an IRCv3 reference implementation
+- High customizability via a rehashable (i.e., reloadable at runtime) YAML config
+
+
+
+**Paketatutako bertsioa:** 2.13.1~ynh1
+
+**Demoa:** <https://testnet.ergo.chat/>
+
+## Pantaila-argazkiak
+
+![Ergo(r)en pantaila-argazkia](./doc/screenshots/textual.jpg)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://ergo.chat/>
+- Erabiltzaileen dokumentazio ofiziala: <https://github.com/ergochat/ergo/blob/stable/docs/USERGUIDE.md>
+- Administratzaileen dokumentazio ofiziala: <https://github.com/ergochat/ergo/blob/stable/docs/MANUAL.md>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/ergochat/ergo>
+- YunoHost Denda: <https://apps.yunohost.org/app/ergo>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/ergo_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/ergo_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/ergo_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade ergo -u https://github.com/YunoHost-Apps/ergo_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -26,7 +26,7 @@ Ergo (anciennement connu sous le nom d'Oragono) est un serveur IRC moderne écri
 - Haute personnalisation via une configuration YAML réutilisable (c'est-à-dire rechargeable au moment de l'exécution)
 
 
-**Version incluse :** 2.13.0~ynh1
+**Version incluse :** 2.13.1~ynh1
 
 **Démo :** <https://testnet.ergo.chat/>
 

README_gl.md

@@ -27,7 +27,7 @@ Ergo (formerly known as Oragono) is a modern IRC server written in Go. Its core
 
 
 
-**Versión proporcionada:** 2.13.0~ynh1
+**Versión proporcionada:** 2.13.1~ynh1
 
 **Demo:** <https://testnet.ergo.chat/>
 

README_zh_Hans.md

@@ -0,0 +1,59 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Ergo
+
+[![集成程度](https://dash.yunohost.org/integration/ergo.svg)](https://dash.yunohost.org/appci/app/ergo) ![工作状态](https://ci-apps.yunohost.org/ci/badges/ergo.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/ergo.maintain.svg)
+
+[![使用 YunoHost 安装 Ergo](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ergo)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Ergo。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Ergo (formerly known as Oragono) is a modern IRC server written in Go. Its core design 
+
+### Features
+
+- Being simple to set up and use
+- Combining the features of an ircd, a services framework, and a bouncer (integrated account management, history storage, and bouncer functionality)
+- Bleeding-edge IRCv3 support, suitable for use as an IRCv3 reference implementation
+- High customizability via a rehashable (i.e., reloadable at runtime) YAML config
+
+
+
+**分发版本：** 2.13.1~ynh1
+
+**演示：** <https://testnet.ergo.chat/>
+
+## 截图
+
+![Ergo 的截图](./doc/screenshots/textual.jpg)
+
+## 文档与资源
+
+- 官方应用网站： <https://ergo.chat/>
+- 官方用户文档： <https://github.com/ergochat/ergo/blob/stable/docs/USERGUIDE.md>
+- 官方管理文档： <https://github.com/ergochat/ergo/blob/stable/docs/MANUAL.md>
+- 上游应用代码库： <https://github.com/ergochat/ergo>
+- YunoHost 商店： <https://apps.yunohost.org/app/ergo>
+- 报告 bug： <https://github.com/YunoHost-Apps/ergo_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/ergo_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/ergo_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade ergo -u https://github.com/YunoHost-Apps/ergo_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

manifest.toml

@@ -5,7 +5,7 @@ name = "Ergo"
 description.en = "Modern IRC server (daemon/ircd)"
 description.fr = "Serveur IRC moderne (démon/ircd)"
 
-version = "2.13.0~ynh1"
+version = "2.13.1~ynh1"
 
 maintainers = ["Navan Chauhan"]
 
@@ -77,12 +77,12 @@ ram.runtime = "50M"
 [resources]
     [resources.sources]
         [resources.sources.main]
-        arm64.url = "https://github.com/ergochat/ergo/releases/download/v2.13.0/ergo-2.13.0-linux-arm64.tar.gz"
+        arm64.url = "https://github.com/ergochat/ergo/releases/download/v2.13.1/ergo-2.13.1-linux-arm64.tar.gz"
-        arm64.sha256 = "a58b9dd78dc52f4b0faa96252fc80a111b3d71d0efce3b2233cff5a89b84bf81"
+        arm64.sha256 = "ec7403c427019443395cb8691939a0751f9dfbf2db00829ec5d15b529668e0fe"
-        amd64.url = "https://github.com/ergochat/ergo/releases/download/v2.13.0/ergo-2.13.0-linux-x86_64.tar.gz"
+        amd64.url = "https://github.com/ergochat/ergo/releases/download/v2.13.1/ergo-2.13.1-linux-x86_64.tar.gz"
-        amd64.sha256 = "476e65c85f6696231475ac30e09b50f20d96592f1fbee2d191cbedd3aad69fe1"
+        amd64.sha256 = "eb473fc7bfbb804e6970cd9646b84c23a443a7b70a3e1d7dfaf1ec6a3b38aa7b"
-        armhf.url = "https://github.com/ergochat/ergo/releases/download/v2.13.0/ergo-2.13.0-linux-armv6.tar.gz"
+        armhf.url = "https://github.com/ergochat/ergo/releases/download/v2.13.1/ergo-2.13.1-linux-armv6.tar.gz"
-        armhf.sha256 = "bba15e3b6d3a50b84aa9b716c0622e16cfd45052237ad86abe7d6dcbb49246ba"
+        armhf.sha256 = "eec00244a7e91fd5f6d341aaba3fafea3f7c08b3125bdf9d9c647ed11350be34"
 
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset.arm64 = "^ergo-.*-linux-arm64.tar.gz"

scripts/upgrade

@@ -9,12 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -27,14 +21,11 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+# Download, check integrity, uncompress and patch the source from app.src
-then
+ynh_setup_source --dest_dir="$install_dir" --keep="ircd.yaml"
-	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" --keep="ircd.yaml"
-fi
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"