From c2ae19af07112c566046eecd31398a8c9ebdb676 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Tue, 22 Dec 2020 09:25:55 +0100
Subject: [PATCH 1/2] Upgrade to upstream version 1.28.0

---
 CHANGELOG.md  | 5 +++++
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1169bf..8d173a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ Changelog
 ## Unreleased
 - Nothing for now...
 
+## [1.28.0~ynh1](https://github.com/YunoHost-Apps/netdata_ynh/pull/50) - 2020-12-19
+
+#### Changed
+* [Update to 1.28.0](https://github.com/YunoHost-Apps/netdata_ynh/pull/50)
+
 ## [1.26.0~ynh1](https://github.com/YunoHost-Apps/netdata_ynh/pull/50) - 2020-11-15
 
 #### Changed
diff --git a/conf/app.src b/conf/app.src
index b7a7af3..0ce202e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.26.0/netdata-v1.26.0.tar.gz
-SOURCE_SUM=33af27eb57f954e50059a32bec624815aa742fe03182845b1d9b577f1e20e30a
+SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.28.0/netdata-v1.28.0.tar.gz
+SOURCE_SUM=44801e240b1883a98d203156397cc8d9232492f3136891e61074e2e7facbf1a8
 SOURCE_FORMAT=tar.gz
diff --git a/manifest.json b/manifest.json
index 5953763..bbab061 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "real-time performance and health monitoring",
         "fr": "Monitoring serveur en temps reel"
     },
-    "version": "1.26.0~ynh1",
+    "version": "1.28.0~ynh1",
     "url": "http://my-netdata.io/",
     "license": "GPL-3.0",
     "maintainer": {

From 97ea71720be90f69c880cdbfbd91844bbd1f70ca Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Tue, 22 Dec 2020 09:26:19 +0100
Subject: [PATCH 2/2] Misc linter fixes

---
 scripts/backup  |  2 +-
 scripts/install |  2 +-
 scripts/restore |  4 ++--
 scripts/upgrade | 13 ++++++-------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 9440f6f..72071b5 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
 
diff --git a/scripts/install b/scripts/install
index 0f7d350..05b7b39 100644
--- a/scripts/install
+++ b/scripts/install
@@ -92,7 +92,7 @@ ynh_add_nginx_config
 # SPECIFIC SETUP
 #=================================================
 
-ynh_script_progression --message="Executing Netdata installer..." --weight=180
+ynh_script_progression --message="Executing Netdata installer..." --weight=30
 
 # create a temporary file for the log
 tmp=$(mktemp /tmp/netdata-updater-log-XXXXXX.log)
diff --git a/scripts/restore b/scripts/restore
index 3e55786..a53d16f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -71,7 +71,7 @@ ynh_install_app_dependencies $pkg_dependencies
 # INSTALL AND RESTORE THE APP CONFIGURATION
 #=================================================
 
-ynh_script_progression --message="Reinstalling Netdata..." --weight=180
+ynh_script_progression --message="Reinstalling Netdata..." --weight=30
 
 # Download, check integrity, uncompress and patch the source from app.src
 NETDATA_TMPDIR=$(mktemp -d)
@@ -87,7 +87,7 @@ configure_netdata
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
 
-yunohost service add $app --description "A short description of the app" --log "$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log"
+yunohost service add $app --description "Real-time performance and health monitoring for systems and applications" --log "$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index b6ad8ee..ae68f11 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -69,13 +69,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# CHECK THE PATH
-#=================================================
-
-# Normalize the URL path syntax
-path_url=$(ynh_normalize_url_path --path_url=$path_url)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -141,6 +134,12 @@ ynh_install_app_dependencies $pkg_dependencies
 # GENERIC FINALIZATION
 #=================================================
 
+#=================================================
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+
+yunohost service add $app --description "Real-time performance and health monitoring for systems and applications" --log "$final_path/var/log/netdata/error.log" "$final_path/var/log/netdata/access.log" "$final_path/var/log/netdata/debug.log"
+
 #=================================================
 # SETUP SSOWAT
 #=================================================