From 288bf31a5f6074b4b6efc4ab0308ca4ea1f37fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 22 Feb 2021 21:44:43 +0100 Subject: [PATCH] V.14.1.1 (#10) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Testing (#8) * Upgrade to version 12.9.3 * Update README.md Small update on the link's demo. We don't know how long they gonna redirect draw.io to app.diagrams.net * Remove commented code unused * Force http parameter to disable 3rds parties * fix quotting * Documentation * Upgrade version to 12.9.7 * Update README.md (#9) Co-authored-by: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com> Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> * Upgrade to upstream version Co-authored-by: Gofannon <17145502+Gofannon@users.noreply.github.com> Co-authored-by: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com> --- CHANGELOG.md | 5 +++++ README.md | 12 ++++++------ check_process | 3 --- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/backup | 11 ++++++----- scripts/upgrade | 6 ------ 7 files changed, 21 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d85b9f..2980f6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +## [14.1.1~ynh1] - 2020-12-20 + +### Changed +- upgrade source to upstream + ## [13.2.5~ynh1] - 2020-07-03 ### Changed diff --git a/README.md b/README.md index c67226c..ac48089 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # diagrams.net for YunoHost [![Integration level](https://dash.yunohost.org/integration/diagramsnet.svg)](https://dash.yunohost.org/appci/app/diagramsnet) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.maintain.svg) -[![Install diagramsnet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=diagramsnet) +[![Install diagramsnet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diagramsnet) > *This package allow you to install diagrams.net quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. -**Shipped version:** 13.2.5 +**Shipped version:** 14.1.1 ## Screenshots @@ -43,10 +43,10 @@ diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from s ## Links -* Report a bug: -* App website: -* Upstream app repository: -* YunoHost website: +* Report a bug: https://github.com/YunoHost-Apps/diagramsnet_ynh/issues +* App website: https://drawio-app.com> +* Upstream app repository: https://github.com/jgraph/drawio +* YunoHost website: https://yunohost.org> --- diff --git a/check_process b/check_process index 59a69b4..1b2e1c9 100644 --- a/check_process +++ b/check_process @@ -15,9 +15,6 @@ backup_restore=1 multi_instance=1 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none diff --git a/conf/app.src b/conf/app.src index c518635..736f3aa 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v13.2.5.tar.gz -SOURCE_SUM=8c775ae75b944b09fbcc49fa389df55eb9049b457b59b73b8606e22d45f279f2 +SOURCE_URL=https://github.com/jgraph/drawio/archive/v14.1.1.tar.gz +SOURCE_SUM=0b8447d53f935b773b246f90e9f36b8638c1cbb52c800184e751863808a909cd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index ef84e21..b29e55f 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": "13.2.5~ynh1", + "version": "14.1.1~ynh1", "url": "https://www.diagrams.net/", "license": "Apache-2.0", "maintainer": { @@ -14,7 +14,7 @@ "email": "gofannon@riseup.net" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ diff --git a/scripts/backup b/scripts/backup index 495433e..f441cc6 100644 --- a/scripts/backup +++ b/scripts/backup @@ -24,7 +24,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -32,18 +32,19 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_script_progression --message="Backing up the main app directory..." --weight=2 ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." --weight=1 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -51,4 +52,4 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/upgrade b/scripts/upgrade index d15dfd0..93d41e4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,12 +25,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # CHECK VERSION #================================================= -### This helper will compare the version of the currently installed app and the version of the upstream package. -### $upgrade_type can have 2 different values -### - UPGRADE_APP if the upstream app version has changed -### - UPGRADE_PACKAGE if only the YunoHost package has changed -### ynh_check_app_version_changed will stop the upgrade if the app is up to date. -### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do. upgrade_type=$(ynh_check_app_version_changed) #=================================================