diff --git a/conf/app.src b/conf/app.src index 4558109..fbbad2e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v14.9.7.tar.gz -SOURCE_SUM=d102106ccd61763a6b71ac3119573e5f39d1bd1a268686c3ad8455dc41181dfc +SOURCE_URL=https://github.com/jgraph/drawio/archive/v15.6.8.tar.gz +SOURCE_SUM=f8e73c988c8875ab8cd102ebacfa46b6267b9e77215a1cd6510fa1ee138d8293 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index 9b1bc48..4fc9a9a 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": "14.9.7~ynh1", + "version": "15.6.8~ynh1", "url": "https://www.diagrams.net/", "upstream": { "license": "Apache-2.0", @@ -31,8 +31,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/_common.sh b/scripts/_common.sh index eea5970..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,6 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -#pkg_dependencies="deb1 deb2" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 91f9080..4ce66da 100644 --- a/scripts/install +++ b/scripts/install @@ -83,7 +83,6 @@ ynh_add_nginx_config # Add "offline" parameter in index.html # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- -# and https://shelter.moe/@Neil/103928506546498078 [French] sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g" sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" diff --git a/scripts/upgrade b/scripts/upgrade index 667569e..6b35514 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,18 +26,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -52,6 +40,18 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -75,7 +75,6 @@ then # Add "offline" parameter in index.html # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- - # and https://shelter.moe/@Neil/103928506546498078 [French] sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g" sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" fi