From fdeecace825cf9550c051763af4cd3e12505c7fd Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:30:49 +0200 Subject: [PATCH 1/9] Add autoupdate.asset.$arch to manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index f5c27a2..0fa6660 100644 --- a/manifest.toml +++ b/manifest.toml @@ -52,6 +52,9 @@ ram.runtime = "50M" # https://yunohost.org/fr/packaging_apps_resources#regarding-autoupdate autoupdate.strategy = "latest_github_release" + autoupdate.asset.amd64 = "kavita-linux-x64.tar.gz" + autoupdate.asset.arm64 = "kavita-linux-arm64.tar.gz" + autoupdate.asset.armhf = "kavita-linux-arm.tar.gz" [resources.ports] main.default = 5000 From a7872763ada893031e27f46334af7a3dc3ed3bb1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 4 Sep 2023 19:05:00 +0200 Subject: [PATCH 2/9] Upgrade to v0.7.8 --- manifest.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0fa6660..0e95e29 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Kavita" description.en = "Media server for your comics, manga and books" description.fr = "Serveur multimédia pour vos bandes dessinées, mangas et livres" -version = "0.7.7~ynh1" +version = "0.7.8~ynh1" maintainers = ["eric_G"] @@ -43,12 +43,12 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] in_subdir = true - amd64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.7/kavita-linux-x64.tar.gz" - amd64.sha256 = "12009b69f6263274752b617d33fd9486ad8b2bf3602ff3309c0cd5496ab3a71a" - arm64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.7/kavita-linux-arm64.tar.gz" - arm64.sha256 = "53d73c0f47822c0772c51f0f3dcc3c911e0a8706d07dd9bf75dea4a21fd89bdb" - armhf.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.7/kavita-linux-arm.tar.gz" - armhf.sha256 = "283fc142ea9b281c2242dfe7e54774ce273d8990b8f0418dd90ec5bcac85e624" + amd64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.8/kavita-linux-x64.tar.gz" + amd64.sha256 = "0a939ca8f521a53c14a4caa2f7314eab802cbeddfadb40ba6334ddd1d4b725d7" + arm64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.8/kavita-linux-arm64.tar.gz" + arm64.sha256 = "3c6ac3d43c2887c717bd3b3038b2d4ffcd2e3f6627b8e0e9b24e87d3f1ee4b8e" + armhf.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.8/kavita-linux-arm.tar.gz" + armhf.sha256 = "90eef5f384f28bc00d4bfa3db8872acef27df2a985b00f4509c3875c0929c0a8" # https://yunohost.org/fr/packaging_apps_resources#regarding-autoupdate autoupdate.strategy = "latest_github_release" From 4f53863d3e819ce8ec1abbae39537411042d995e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 4 Sep 2023 17:05:03 +0000 Subject: [PATCH 3/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea4b247..79381b3 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu - OPDS-PS Support -**Shipped version:** 0.7.7~ynh1 +**Shipped version:** 0.7.8~ynh1 **Demo:** https://demo.kavitareader.com/ diff --git a/README_fr.md b/README_fr.md index 27d794a..bb899c5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu - OPDS-PS Support -**Version incluse :** 0.7.7~ynh1 +**Version incluse :** 0.7.8~ynh1 **Démo :** https://demo.kavitareader.com/ From d95ea16c0144d86c77d524d4f1ccca77c8f48df0 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 5 Sep 2023 17:02:21 +0200 Subject: [PATCH 4/9] permit arch migration --- scripts/restore | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/restore b/scripts/restore index 7a44c5a..3a76001 100755 --- a/scripts/restore +++ b/scripts/restore @@ -21,6 +21,24 @@ chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R "$app":www-data "$install_dir" +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= + +# compare is the system arch is different from the binary arch +# if so, download the correct binary +if [ "$(uname -m)" != "$(file "$final_path"/Kavita | cut -d ',' -f 2 | tr -d ' ')" ] +then + ynh_script_progression --message="Migrating binary architecture..." --weight=1 + + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$install_dir" --keep="config/appsettings.json" +fi + +chmod -R o-rwx "$install_dir" +chown -R "$app":www-data "$install_dir" +chmod +x "$install_dir"/Kavita + #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= From 51ae6014fd37d647e9c668f5b6c4ebf938eb26e6 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 5 Sep 2023 17:04:12 +0200 Subject: [PATCH 5/9] typo --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 3a76001..1d245ce 100755 --- a/scripts/restore +++ b/scripts/restore @@ -25,7 +25,7 @@ chown -R "$app":www-data "$install_dir" # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -# compare is the system arch is different from the binary arch +# compare if the system arch is different from the binary arch # if so, download the correct binary if [ "$(uname -m)" != "$(file "$final_path"/Kavita | cut -d ',' -f 2 | tr -d ' ')" ] then From d6b64f54cccfc25b25559d9439adc542f1c4b808 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Sep 2023 17:51:50 +0000 Subject: [PATCH 6/9] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 79381b3..5543544 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,6 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index bb899c5..9b6f884 100644 --- a/README_fr.md +++ b/README_fr.md @@ -44,7 +44,6 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 63e5106b561211f131e464f693ba99b9c3e4f988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 29 Sep 2023 20:12:05 +0200 Subject: [PATCH 7/9] cleaning --- doc/DESCRIPTION_fr.md | 13 +++++++++++++ manifest.toml | 2 +- scripts/restore | 1 - 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..786a56f --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,13 @@ +Kavita est un serveur de lecture multiplateforme rapide et riche en fonctionnalités. Conçu en mettant l'accent sur les mangas et dans le but d'être une solution complète pour tous vos besoins de lecture. Configurez votre propre serveur et partagez votre collection de lectures avec vos amis et votre famille. + +### Caractéristiques + +- Prise en charge étendue des fichiers +- Lecteur de mangas/bandes dessinées +- Lecteur de livres +- Gestion et partage des utilisateurs +- Multiplateforme sans dépendances - Tout est dans la boîte +- Recherche en texte intégral pour trouver rapidement ce que vous voulez lire +- Bibliothèques multimédias - Les Light Novels et les Mangas peuvent être côte à côte +- Analyses de bibliothèque rapides et efficaces. N'effectuez pas d'E/S si le fichier sous-jacent n'a pas changé. +- Prise en charge OPDS-PS \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 0e95e29..08562a9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://wiki.kavitareader.com/en" code = "https://github.com/Kareadita/Kavita" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2" architectures = ["amd64", "arm64", "armhf"] multi_instance = true ldap = false diff --git a/scripts/restore b/scripts/restore index 1d245ce..6879f04 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R "$app":www-data "$install_dir" From 0b30129d525a35b55a5c09598005b8df245760a7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Sep 2023 18:12:11 +0000 Subject: [PATCH 8/9] Auto-update README --- README_fr.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/README_fr.md b/README_fr.md index 9b6f884..29d1e84 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,20 +16,19 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Kavita is a fast, feature rich, cross platform reading server. Built with a focus for manga and the goal of being a full solution for all your reading needs. Setup your own server and share your reading collection with your friends and family. +Kavita est un serveur de lecture multiplateforme rapide et riche en fonctionnalités. Conçu en mettant l'accent sur les mangas et dans le but d'être une solution complète pour tous vos besoins de lecture. Configurez votre propre serveur et partagez votre collection de lectures avec vos amis et votre famille. -### Features - -- Extensive File support -- Manga/Comic Reader -- Book Reader -- User Management and Sharing -- Cross Platform with no dependencies - Everything in the box -- Full-text search to quickly find what you want to read -- Mixed media Libraries - Light Novels and Manga can be right next to each other -- Fast and efficient library scans. Don't perform I/O if the underlying file hasn't changed. -- OPDS-PS Support +### Caractéristiques +- Prise en charge étendue des fichiers +- Lecteur de mangas/bandes dessinées +- Lecteur de livres +- Gestion et partage des utilisateurs +- Multiplateforme sans dépendances - Tout est dans la boîte +- Recherche en texte intégral pour trouver rapidement ce que vous voulez lire +- Bibliothèques multimédias - Les Light Novels et les Mangas peuvent être côte à côte +- Analyses de bibliothèque rapides et efficaces. N'effectuez pas d'E/S si le fichier sous-jacent n'a pas changé. +- Prise en charge OPDS-PS **Version incluse :** 0.7.8~ynh1 From 64df1dbe0b9690d7f70c389944382ca015530187 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 29 Sep 2023 21:13:26 +0200 Subject: [PATCH 9/9] fic: "line 29: final_path: unbound variable" --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 6879f04..ea8d31e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -26,7 +26,7 @@ chown -R "$app":www-data "$install_dir" # compare if the system arch is different from the binary arch # if so, download the correct binary -if [ "$(uname -m)" != "$(file "$final_path"/Kavita | cut -d ',' -f 2 | tr -d ' ')" ] +if [ "$(uname -m)" != "$(file "$install_dir"/Kavita | cut -d ',' -f 2 | tr -d ' ')" ] then ynh_script_progression --message="Migrating binary architecture..." --weight=1