From ebdf7876ce1026bb008c31026536a4c4b6d9c107 Mon Sep 17 00:00:00 2001
From: Romain Bazile <gromain.baz@gmail.com>
Date: Fri, 27 Nov 2020 12:50:35 +0100
Subject: [PATCH] update: final update to flow

---
 flows/main.json        | 35 ++++++++---------------------------
 scripts/bash/update.sh |  1 -
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/flows/main.json b/flows/main.json
index d7ac62a..d6373a9 100644
--- a/flows/main.json
+++ b/flows/main.json
@@ -1478,7 +1478,7 @@
         "timer": "1",
         "oldrc": false,
         "name": "i2c update",
-        "x": 520,
+        "x": 530,
         "y": 1080,
         "wires": [
             [],
@@ -3777,16 +3777,15 @@
         "command": "bash /home/pi/PlanktonScope/scripts/bash/update.sh",
         "addpay": false,
         "append": "",
-        "useSpawn": "false",
-        "timer": "2",
+        "useSpawn": "true",
+        "timer": "",
         "oldrc": false,
         "name": "Update",
         "x": 300,
         "y": 520,
         "wires": [
             [
-                "1fa7fddf.18161a",
-                "8c3e4a1c.1ebbb"
+                "1fa7fddf.18161a"
             ],
             [
                 "8c3e4a1c.1ebbb"
@@ -4036,7 +4035,7 @@
         "order": 1,
         "width": 0,
         "height": 0,
-        "format": "<div><center>If you want to update to the latest code version of Node-Red and Python, please click here.\nWe are trying to save your changes with git stash and restore them afterwards, but clearly, things may break!</center></div>",
+        "format": "<div><center>If you want to update to the latest code version of Node-Red and Python, please click here.\nWe are trying to save your configuration changes with git stash and restore them afterwards, but clearly, things may break!\nIf you have made changes to the flow, you will lose them. Please commit those changes from Node-Red interface, from the Project History tab.</center></div>",
         "storeOutMessages": true,
         "fwdInMessages": true,
         "resendOnRefresh": true,
@@ -4752,8 +4751,7 @@
         "y": 700,
         "wires": [
             [
-                "3e64877a.9684b",
-                "1bdd7f07.616f69"
+                "3e64877a.9684b"
             ],
             [],
             []
@@ -4770,7 +4768,7 @@
         "initialize": "",
         "finalize": "",
         "x": 790,
-        "y": 640,
+        "y": 660,
         "wires": [
             [
                 "8343fa69.49339"
@@ -4954,7 +4952,7 @@
         "format": "{{msg.payload}}",
         "layout": "row-spread",
         "x": 1040,
-        "y": 640,
+        "y": 660,
         "wires": []
     },
     {
@@ -4973,23 +4971,6 @@
         "y": 740,
         "wires": []
     },
-    {
-        "id": "1bdd7f07.616f69",
-        "type": "debug",
-        "z": "1371dec5.76e671",
-        "name": "",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "payload",
-        "targetType": "msg",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 790,
-        "y": 680,
-        "wires": []
-    },
     {
         "id": "a0e2d78c.a587e",
         "type": "inject",
diff --git a/scripts/bash/update.sh b/scripts/bash/update.sh
index b35bf91..7a524cd 100755
--- a/scripts/bash/update.sh
+++ b/scripts/bash/update.sh
@@ -4,7 +4,6 @@ log="logger -t update.sh -s "
 ${log} "Updating the main repository"
 cd /home/pi/PlanktonScope
 
-echo "Update output:\n"
 sudo killall -15 raspimjpeg
 sudo killall -15 python3
 git stash