Merge pull request #42 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

@@ -28,7 +28,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl
 - Where possible, by default shiori will download a static copy of the webpage in simple text and HTML format, which later can be used as an offline archive for that page.
 
 
-**Shipped version:** 1.6.3~ynh1
+**Shipped version:** 1.7.0~ynh1
 
 ## Screenshots
 

README_es.md

@@ -0,0 +1,57 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Shiori para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/shiori.svg)](https://dash.yunohost.org/appci/app/shiori) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/shiori.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/shiori.maintain.svg)
+
+[![Instalar Shiori con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shiori)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarShiori 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
+
+Shiori is a simple bookmarks manager written in Go language. Intended as a simple clone of Pocket. You can use it as command line application or as web application. This application is distributed as a single binary, which means it can be installed and used easily.
+
+### Features
+
+- Simple and clean command line interface.
+- Basic bookmarks management i.e. add, edit and delete.
+- Search bookmarks by their title, tags, URL and page content.
+- Import and export bookmarks from and to Netscape Bookmark file.
+- Simple web interface for those who don't want to use a command line app.
+- Where possible, by default shiori will download a static copy of the webpage in simple text and HTML format, which later can be used as an offline archive for that page.
+
+
+**Versión actual:** 1.7.0~ynh1
+
+## Capturas
+
+![Captura de Shiori](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Documentación usuario oficial: <https://github.com/go-shiori/shiori/wiki/Usage>
+- Documentación administrador oficial: <https://github.com/go-shiori/shiori/wiki>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/go-shiori/shiori>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/shiori>
+- Reportar un error: <https://github.com/YunoHost-Apps/shiori_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/shiori_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/shiori_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade shiori -u https://github.com/YunoHost-Apps/shiori_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -28,7 +28,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl
 - Where possible, by default shiori will download a static copy of the webpage in simple text and HTML format, which later can be used as an offline archive for that page.
 
 
-**Paketatutako bertsioa:** 1.6.3~ynh1
+**Paketatutako bertsioa:** 1.7.0~ynh1
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -28,7 +28,7 @@ Shiori est un simple gestionnaire de signets écrit en langage Go. Conçu comme
 - Dans la mesure du possible, shiori téléchargera par défaut une copie statique de la page Web au format texte simple et HTML, qui pourra ensuite être utilisée comme archive hors ligne pour cette page.
 
 
-**Version incluse :** 1.6.3~ynh1
+**Version incluse :** 1.7.0~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -28,7 +28,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl
 - Where possible, by default shiori will download a static copy of the webpage in simple text and HTML format, which later can be used as an offline archive for that page.
 
 
-**Versión proporcionada:** 1.6.3~ynh1
+**Versión proporcionada:** 1.7.0~ynh1
 
 ## Capturas de pantalla
 

README_zh_Hans.md

@@ -3,7 +3,7 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Shiori
+# YunoHost 上的 Shiori
 
 [![集成程度](https://dash.yunohost.org/integration/shiori.svg)](https://dash.yunohost.org/appci/app/shiori) ![工作状态](https://ci-apps.yunohost.org/ci/badges/shiori.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/shiori.maintain.svg)
 
@@ -28,7 +28,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl
 - Where possible, by default shiori will download a static copy of the webpage in simple text and HTML format, which later can be used as an offline archive for that page.
 
 
-**分发版本：** 1.6.3~ynh1
+**分发版本：** 1.7.0~ynh1
 
 ## 截图
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Shiori"
 description.en = "Simple bookmark manager"
 description.fr = "Gestionnaire de liens simple"
 
-version = "1.6.3~ynh1"
+version = "1.7.0~ynh1"
 
 maintainers = []
 
@@ -45,17 +45,17 @@ ram.runtime = "50M"
     [resources.sources]
     
         [resources.sources.main]
-        amd64.url = "https://github.com/go-shiori/shiori/releases/download/v1.6.3/shiori_Linux_x86_64.tar.gz"
+        amd64.url = "https://github.com/go-shiori/shiori/releases/download/v1.7.0/shiori_Linux_x86_64_1.7.0.tar.gz"
-        amd64.sha256 = "d352bd0c851c7aab89225cfc730e76b5bd5d7faa92a05c71f51b46af0c46b7fc"
+        amd64.sha256 = "d797908a0bd1ee7f7802aee5a1470ce00539510fe53956a9fa6c7fc0122bad4f"
-        arm64.url = "https://github.com/go-shiori/shiori/releases/download/v1.6.3/shiori_Linux_aarch64.tar.gz"
+        arm64.url = "https://github.com/go-shiori/shiori/releases/download/v1.7.0/shiori_Linux_aarch64_1.7.0.tar.gz"
-        arm64.sha256 = "688ddac88c3dc150f2ef3e7a34298689c63d5f09971e3aed3a0cca289c273bec"
+        arm64.sha256 = "5c0d14dc6892a2550c071f5f4a570f2de6f44bb029a098dcd3f9745fe9d4a394"
-        armhf.url = "https://github.com/go-shiori/shiori/releases/download/v1.6.3/shiori_Linux_arm.tar.gz"
+        armhf.url = "https://github.com/go-shiori/shiori/releases/download/v1.7.0/shiori_Linux_arm_1.7.0.tar.gz"
-        armhf.sha256 = "f9e15372775d9211b01ab5ee22c53daad4508bab9650f16902d9ea08b9f0a2ea"
+        armhf.sha256 = "a952540a9deba17ad2b89a582280086f11c4c8273e6e1a9bab529f02ea6de31b"
         in_subdir = false
         autoupdate.strategy = "latest_github_release"
-        autoupdate.asset.amd64 = "^shiori_Linux_x86_64.tar.gz$"
+        autoupdate.asset.amd64 = "^shiori_Linux_x86_64_*.tar.gz$"
-        autoupdate.asset.arm64 = "^shiori_Linux_aarch64.tar.gz$"
+        autoupdate.asset.arm64 = "^shiori_Linux_aarch64_*.tar.gz$"
-        autoupdate.asset.armhf = "^shiori_Linux_arm.tar.gz$"
+        autoupdate.asset.armhf = "^shiori_Linux_arm.tar_*.gz$"
 
     [resources.ports]
 

scripts/backup

@@ -33,18 +33,8 @@ ynh_backup --src_path="$data_dir" --is_big
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
-
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================

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,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 #=================================================
 # 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"
-	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"
-fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -44,9 +34,7 @@ chmod +x "$install_dir/shiori"
 # MIGRATE AND UPGRADE
 #=================================================
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+if ynh_compare_current_package_version --comparison lt --version 1.50~ynh9
-then
-	if ynh_compare_current_package_version --comparison lt --version 1.50~ynh9
 	then
 		ynh_script_progression --message="Migrating sqlite from version < 1.50~ynh9..." --weight=1
 		FTS4_EXISTS=$(sqlite3 "$data_dir/shiori.db" "SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'bookmark_content' AND sql LIKE '%USING fts4%';")
@@ -71,7 +59,6 @@ then
 			fi
 		fi
 	fi
-fi
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS