From 6f6bc21952af685c432c383bdbb6a3a0fecd8437 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 8 Jun 2024 08:34:20 +0000 Subject: [PATCH 1/4] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 README_es.md diff --git a/ALL_README.md b/ALL_README.md index a01b345..152f2e7 100644 --- a/ALL_README.md +++ b/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) diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..4a77478 --- /dev/null +++ b/README_es.md @@ -0,0 +1,57 @@ + + +# 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.6.3~ynh1 + +## Capturas + +![Captura de Shiori](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Documentación usuario oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## 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:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index f02f9a1..ad77ffe 100644 --- a/README_zh_Hans.md +++ b/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) From b99c060a62ef0ca9b56ec530f103e527187138fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 8 Jun 2024 10:38:06 +0200 Subject: [PATCH 2/4] Update manifest.toml --- manifest.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index f846f09..ab8e745 100644 --- a/manifest.toml +++ b/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.sha256 = "d352bd0c851c7aab89225cfc730e76b5bd5d7faa92a05c71f51b46af0c46b7fc" - arm64.url = "https://github.com/go-shiori/shiori/releases/download/v1.6.3/shiori_Linux_aarch64.tar.gz" - arm64.sha256 = "688ddac88c3dc150f2ef3e7a34298689c63d5f09971e3aed3a0cca289c273bec" - armhf.url = "https://github.com/go-shiori/shiori/releases/download/v1.6.3/shiori_Linux_arm.tar.gz" - armhf.sha256 = "f9e15372775d9211b01ab5ee22c53daad4508bab9650f16902d9ea08b9f0a2ea" + amd64.url = "https://github.com/go-shiori/shiori/releases/download/v1.7.0/shiori_Linux_x86_64_1.7.0.tar.gz" + amd64.sha256 = "d797908a0bd1ee7f7802aee5a1470ce00539510fe53956a9fa6c7fc0122bad4f" + arm64.url = "https://github.com/go-shiori/shiori/releases/download/v1.7.0/shiori_Linux_aarch64_1.7.0.tar.gz" + arm64.sha256 = "5c0d14dc6892a2550c071f5f4a570f2de6f44bb029a098dcd3f9745fe9d4a394" + armhf.url = "https://github.com/go-shiori/shiori/releases/download/v1.7.0/shiori_Linux_arm_1.7.0.tar.gz" + armhf.sha256 = "a952540a9deba17ad2b89a582280086f11c4c8273e6e1a9bab529f02ea6de31b" in_subdir = false autoupdate.strategy = "latest_github_release" - autoupdate.asset.amd64 = "^shiori_Linux_x86_64.tar.gz$" - autoupdate.asset.arm64 = "^shiori_Linux_aarch64.tar.gz$" - autoupdate.asset.armhf = "^shiori_Linux_arm.tar.gz$" + autoupdate.asset.amd64 = "^shiori_Linux_x86_64_*.tar.gz$" + autoupdate.asset.arm64 = "^shiori_Linux_aarch64_*.tar.gz$" + autoupdate.asset.armhf = "^shiori_Linux_arm.tar_*.gz$" [resources.ports] From 76d6944df29a747c04e42c92766082773de6b0c7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 8 Jun 2024 08:38:16 +0000 Subject: [PATCH 3/4] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2111ef1..209d447 100644 --- a/README.md +++ b/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 diff --git a/README_es.md b/README_es.md index 4a77478..5276489 100644 --- a/README_es.md +++ b/README_es.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 actual:** 1.6.3~ynh1 +**Versión actual:** 1.7.0~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index 28cd7d6..0a172c0 100644 --- a/README_eu.md +++ b/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 diff --git a/README_fr.md b/README_fr.md index 9323202..824c71b 100644 --- a/README_fr.md +++ b/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 diff --git a/README_gl.md b/README_gl.md index da84056..c155441 100644 --- a/README_gl.md +++ b/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 diff --git a/README_zh_Hans.md b/README_zh_Hans.md index ad77ffe..8a65bc1 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.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. -**分发版本：** 1.6.3~ynh1 +**分发版本：** 1.7.0~ynh1 ## 截图 From be417feeffa278be0e922a88f26df80826f54744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 8 Jun 2024 10:39:21 +0200 Subject: [PATCH 4/4] cleaning --- scripts/backup | 10 ---------- scripts/upgrade | 21 ++++----------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/scripts/backup b/scripts/backup index c8931d8..92e3169 100755 --- a/scripts/backup +++ b/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" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 145a290..be519c5 100644 --- a/scripts/upgrade +++ b/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" ] -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" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" 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" ] -then - if ynh_compare_current_package_version --comparison lt --version 1.50~ynh9 +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