From b1fa5c8fa53bde9fab40b8660df84f216195b22f Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 23 Feb 2023 23:41:04 +0100 Subject: [PATCH 1/8] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 4363d38..4a866ff 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From 75b7c5083ff2575bf8c9a7b0b83154b1a581d191 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Feb 2023 22:41:07 +0000 Subject: [PATCH 2/8] Auto-update README --- README.md | 3 ++- README_fr.md | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 13d8279..6292876 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Calibre-web for YunoHost -[![Integration level](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Working status](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Working status](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg) + [![Install Calibre-web with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 0a2cea0..033ec49 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,22 +5,23 @@ It shall NOT be edited by hand. # Calibre-web pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/calibreweb.svg)](https://dash.yunohost.org/appci/app/calibreweb) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/calibreweb.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/calibreweb.maintain.svg) + [![Installer Calibre-web avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calibreweb) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Calibre-web rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Calibre-web rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre **Version incluse :** 0.6.19 -## Captures d'écran +## Captures d’écran -![Capture d'écran de Calibre-web](./doc/screenshots/screenshot.png) +![Capture d’écran de Calibre-web](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -91,8 +92,8 @@ La numérotation est modifiée dans yunohost par rapport à Calibre-web: la vers ## Documentations et ressources -* Documentation officielle de l'admin : -* Dépôt de code 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 : @@ -108,4 +109,4 @@ ou sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From c0a8939039bf94e1ca2c209c09040aac08f40356 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 8 Apr 2023 10:57:22 +0200 Subject: [PATCH 3/8] fix workflow --- .github/workflows/updater.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 45f5447..2d862dc 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -1,6 +1,6 @@ #!/bin/bash -========================================== +#========================================== # FETCHING LATEST RELEASE AND ITS ASSETS #================================================= @@ -43,6 +43,7 @@ echo "PROCEED=false" >> $GITHUB_ENV # Proceed only if the retrieved version is greater than the current one update_upstream=1 update_kepubify=1 + if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then echo "::warning ::No new version available for upstream app" update_upstream=0 @@ -122,6 +123,7 @@ EOT fi done +fi if [ "$update_kepubify"=1 ]; then for asset_url_kepubify in ${assets_kepubify[@]}; do From ecef9d22af1c3d10dc4124b12572b67e583437a0 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 8 Apr 2023 11:05:44 +0200 Subject: [PATCH 4/8] fix var for kepubify --- .github/workflows/updater.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 2d862dc..b3e23f9 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -35,8 +35,8 @@ echo "VERSION=$version" >> $GITHUB_ENV echo "REPO=$repo" >> $GITHUB_ENV echo "Current version for kepubify: $current_version_kepubify" echo "Latest release from upstream for kepubify: $version_kepubify" -echo "VERSION=$version" >> $GITHUB_ENV -echo "REPO=$repo" >> $GITHUB_ENV +echo "VERSION_KEPUBIFY=$version_kepubify" >> $GITHUB_ENV +echo "REPO_KEPUBIFY=$repo_kepubify" >> $GITHUB_ENV # For the time being, let's assume the script will fail echo "PROCEED=false" >> $GITHUB_ENV From f94b01bd68f8fdb27abb429ae8ab2af353f53a0c Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 8 Apr 2023 15:19:00 +0200 Subject: [PATCH 5/8] add messages --- .github/workflows/updater.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index b3e23f9..ef12517 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -63,10 +63,12 @@ elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY. fi if [ "$update_kepubify"=0 ] && [ "$update_upstream"=0 ]; then + echo "::no update : exit" exit 0 fi if [ "$update_upstream"=1 ]; then + echo "Update upstream" # Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) echo "${#assets[@]} available asset(s)" @@ -126,6 +128,7 @@ EOT fi if [ "$update_kepubify"=1 ]; then + echo "Update kepubify" for asset_url_kepubify in ${assets_kepubify[@]}; do echo "Handling asset at $asset_url_kepubify" From 82aeb002f9eba47f0a9857332b874a16decde529 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 8 Apr 2023 15:21:57 +0200 Subject: [PATCH 6/8] echo update_upstream --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index ef12517..22b4c28 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -61,7 +61,7 @@ elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY. echo "::warning ::A branch already exists for this kepubify update" update_kepubify=0 fi - +echo $update_upstream if [ "$update_kepubify"=0 ] && [ "$update_upstream"=0 ]; then echo "::no update : exit" exit 0 From 1c6b4addc9c3eea0ddca9b7e5848fc836e0eefba Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 8 Apr 2023 15:24:54 +0200 Subject: [PATCH 7/8] Missing = --- .github/workflows/updater.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 22b4c28..796b12b 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -61,13 +61,13 @@ elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY. echo "::warning ::A branch already exists for this kepubify update" update_kepubify=0 fi -echo $update_upstream -if [ "$update_kepubify"=0 ] && [ "$update_upstream"=0 ]; then + +if [ "$update_kepubify"== 0 ] && [ "$update_upstream"== 0 ]; then echo "::no update : exit" exit 0 fi -if [ "$update_upstream"=1 ]; then +if [ "$update_upstream" == 1 ]; then echo "Update upstream" # Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) echo "${#assets[@]} available asset(s)" @@ -127,7 +127,7 @@ EOT done fi -if [ "$update_kepubify"=1 ]; then +if [ "$update_kepubify" == 1 ]; then echo "Update kepubify" for asset_url_kepubify in ${assets_kepubify[@]}; do @@ -197,12 +197,12 @@ fi #================================================= # GENERIC FINALIZATION #================================================= -if [ "$update_upstream"=1 ]; then +if [ "$update_upstream" == 1 ]; then # Replace new version in manifest echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json echo "$(jq -s --indent 4 ".[] | .upstream.version = \"$version\"" manifest.json)" > manifest.json fi -if [ "$update_kepubify"=1 ] && [ "$update_upstream"=0 ]; then +if [ "$update_kepubify" == 1 ] && [ "$update_upstream" == 0 ]; then new_yunohost_package_version=$(("$current_yunohost_package_version+1")) echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh$new_yunohost_package_version\"" manifest.json)" > manifest.json fi From 2930701cbcdb84c511fa8f0c256b383f38fb09cf Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 8 Apr 2023 15:26:41 +0200 Subject: [PATCH 8/8] Missing spaces --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 796b12b..6dfd010 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -62,7 +62,7 @@ elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY. update_kepubify=0 fi -if [ "$update_kepubify"== 0 ] && [ "$update_upstream"== 0 ]; then +if [ "$update_kepubify" == 0 ] && [ "$update_upstream" == 0 ]; then echo "::no update : exit" exit 0 fi