From e5531e742f621caa4cb1a90d285b8eef0d46a1fe Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 May 2022 16:44:23 +0000 Subject: [PATCH 1/5] Upgrade to v18.0.3 --- conf/app.src | 7 ++++--- manifest.json | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0f2d50a..54c4ae7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,6 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v18.0.2.tar.gz -SOURCE_SUM=00c9508997e8aeea1d91d928d6108d321e864786529ac92c0599ca6e0de2306e +SOURCE_URL=https://api.github.com/repos/jgraph/drawio/tarball/v18.0.3 +SOURCE_SUM=3096dabfcd8b89d95f75f7b648a6e3caaae26db96b9fb0425aa502ee242857fa SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz +SOURCE_FORMAT=3 SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index 05fa12f..0cbf063 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams", "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel" }, - "version": "18.0.2~ynh1", + "version": "18.0.3~ynh1", "url": "https://www.diagrams.net/", "upstream": { "license": "Apache-2.0", @@ -28,7 +28,7 @@ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" From 336b5ae0676d8a8e2f6375b263d0a0c3b4b88154 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 May 2022 16:44:27 +0000 Subject: [PATCH 2/5] 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 f3c3cf0..72b11df 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams -**Shipped version:** 18.0.2~ynh1 +**Shipped version:** 18.0.3~ynh1 **Demo:** https://app.diagrams.net/ diff --git a/README_fr.md b/README_fr.md index f3fb80e..fe14a05 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Application en ligne qui permet de faire des schémas et du dessin vectoriel -**Version incluse :** 18.0.2~ynh1 +**Version incluse :** 18.0.3~ynh1 **Démo :** https://app.diagrams.net/ From 322db937ec6c73fee0dbd27ac0da3b686244bb72 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 12 May 2022 18:46:26 +0200 Subject: [PATCH 3/5] Fix updater --- .github/workflows/updater.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index ad75bfb..6a28689 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -69,26 +69,19 @@ src="app" tempdir="$(mktemp -d)" # Download sources and calculate checksum -filename=${asset_url##*/} +filename="temp.tar.gz" curl --silent -4 -L $asset_url -o "$tempdir/$filename" checksum=$(sha256sum "$tempdir/$filename" | head -c 64) # Delete temporary directory rm -rf $tempdir -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - # Rewrite source file cat < conf/$src.src SOURCE_URL=$asset_url SOURCE_SUM=$checksum SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= EOT From fdea25977b077b197790f9ded75d0ba59389309c Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 12 May 2022 18:46:41 +0200 Subject: [PATCH 4/5] Update conf/app.src --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index 54c4ae7..8918b58 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ SOURCE_URL=https://api.github.com/repos/jgraph/drawio/tarball/v18.0.3 SOURCE_SUM=3096dabfcd8b89d95f75f7b648a6e3caaae26db96b9fb0425aa502ee242857fa SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=3 +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= From 6d776462ad87601c2aec88d2845255cd7f499ad0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 13 May 2022 19:39:30 +0200 Subject: [PATCH 5/5] Update check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 6bbcac5..f2f2a00 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=9e0c1be11dfe6485ab66f898494eff5bd6bac817 + upgrade=1 from_commit=885714c04d928e26dd3555324b078fdafa24b7bb backup_restore=1 multi_instance=1 change_url=1 @@ -19,7 +19,7 @@ Email= Notification=none ;;; Upgrade options - ; commit=9e0c1be11dfe6485ab66f898494eff5bd6bac817 - name=Upgrade to version 14.4.0 (#13) + ; commit=885714c04d928e26dd3555324b078fdafa24b7bb + name=Merge pull request #43 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&is_public=1