Merge pull request #36 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 Omeka S with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=omeka-s)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Omeka S 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.*
@@ -23,7 +23,7 @@ Omeka S is a web publication system for universities, galleries, libraries, arch
 - Connect to the semantic Web
 - Share with DPLA
 
-**Shipped version:** 4.0.4~ynh1
+**Shipped version:** 4.1.0~ynh1
 
 **Demo:** <https://omeka.org/s/download/#sandbox>
 

README_eu.md

@@ -0,0 +1,54 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Omeka S YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/omeka-s.svg)](https://dash.yunohost.org/appci/app/omeka-s) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/omeka-s.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/omeka-s.maintain.svg)
+
+[![Instalatu Omeka S YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=omeka-s)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Omeka S YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Omeka S is a web publication system for universities, galleries, libraries, archives, and museums. It consists of a local network of independently curated exhibits sharing a collaboratively built pool of items, media, and their metadata.
+
+### Features
+
+- Connect to the semantic Web
+- Share with DPLA
+
+**Paketatutako bertsioa:** 4.1.0~ynh1
+
+**Demoa:** <https://omeka.org/s/download/#sandbox>
+
+## Pantaila-argazkiak
+
+![Omeka S(r)en pantaila-argazkia](./doc/screenshots/omeka-s.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://omeka.org/s/>
+- Erabiltzaileen dokumentazio ofiziala: <https://omeka.org/s/docs/user-manual/>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/omeka/omeka-s>
+- YunoHost Denda: <https://apps.yunohost.org/app/omeka-s>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/omeka-s_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade omeka-s -u https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -23,7 +23,7 @@ Omeka S est un système de publication Web pour les universités, les galeries,
 - Se connecter au Web sémantique
 - Partager avec DPLA
 
-**Version incluse :** 4.0.4~ynh1
+**Version incluse :** 4.1.0~ynh1
 
 **Démo :** <https://omeka.org/s/download/#sandbox>
 

README_gl.md

@@ -23,7 +23,7 @@ Omeka S is a web publication system for universities, galleries, libraries, arch
 - Connect to the semantic Web
 - Share with DPLA
 
-**Versión proporcionada:** 4.0.4~ynh1
+**Versión proporcionada:** 4.1.0~ynh1
 
 **Demo:** <https://omeka.org/s/download/#sandbox>
 

README_zh_Hans.md

@@ -0,0 +1,54 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 的 Omeka S
+
+[![集成程度](https://dash.yunohost.org/integration/omeka-s.svg)](https://dash.yunohost.org/appci/app/omeka-s) ![工作状态](https://ci-apps.yunohost.org/ci/badges/omeka-s.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/omeka-s.maintain.svg)
+
+[![使用 YunoHost 安装 Omeka S](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=omeka-s)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Omeka S。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Omeka S is a web publication system for universities, galleries, libraries, archives, and museums. It consists of a local network of independently curated exhibits sharing a collaboratively built pool of items, media, and their metadata.
+
+### Features
+
+- Connect to the semantic Web
+- Share with DPLA
+
+**分发版本：** 4.1.0~ynh1
+
+**演示：** <https://omeka.org/s/download/#sandbox>
+
+## 截图
+
+![Omeka S 的截图](./doc/screenshots/omeka-s.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://omeka.org/s/>
+- 官方用户文档： <https://omeka.org/s/docs/user-manual/>
+- 上游应用代码库： <https://github.com/omeka/omeka-s>
+- YunoHost 商店： <https://apps.yunohost.org/app/omeka-s>
+- 报告 bug： <https://github.com/YunoHost-Apps/omeka-s_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade omeka-s -u https://github.com/YunoHost-Apps/omeka-s_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

manifest.toml

@@ -5,7 +5,7 @@ name = "Omeka S"
 description.en = "Web publication system for universities, galleries, libraries, archives, and museums"
 description.fr = "Système de publication Web pour les universités, les galeries, les bibliothèques, les archives et les musées"
 
-version = "4.0.4~ynh1"
+version = "4.1.0~ynh1"
 
 maintainers = ["eric_G"]
 
@@ -20,8 +20,11 @@ code = "https://github.com/omeka/omeka-s"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "500M"
 ram.runtime = "50M"
@@ -45,8 +48,8 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/omeka/omeka-s/releases/download/v4.0.4/omeka-s-4.0.4.zip"
+        url = "https://github.com/omeka/omeka-s/releases/download/v4.1.0/omeka-s-4.1.0.zip"
-        sha256 = "6162a2621a20e9110bf376b0866da407f4f8ea82932fcaaef467202f0d83d9f3"
+        sha256 = "bc0f87c07906c1aef1538b8cd1ab1ee9c3c3fe227ffea96b433a691fbd72d05f"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
@@ -57,7 +60,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server imagemagick php8.2-mysql php8.2-gd php8.2-mbstring php8.2-xml"
+    packages = "mariadb-server, imagemagick, php8.2-mysql, php8.2-gd, php8.2-mbstring, php8.2-xml"
 
     [resources.database]
     type = "mysql"

scripts/upgrade

@@ -9,8 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -37,14 +35,10 @@ fi
 #=================================================
 # 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="config/local.config.php config/database.ini modules themes files"
-	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="config/local.config.php config/database.ini modules themes files"
-fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"