From 69fc88c689b20fbb81fc5abf9f0b5eb2a14c5a62 Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Thu, 14 Apr 2022 20:43:13 +0200
Subject: [PATCH] Make update from gui more robust

---
 commander                       | 4 ++--
 gui/templates/views/manage.tmpl | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/commander b/commander
index 2788a19..bcc6900 100755
--- a/commander
+++ b/commander
@@ -218,9 +218,9 @@ case $txt in
     cd $dn
     branch="$(git symbolic-ref --short HEAD 2>/dev/null)" || branch="(none)"
     if [ "$branch" == "master" ] || [ "$branch" == "main" ] || [ "$branch" == "(none)" ]; then
-        /home/labca/labca/install &>>$LOGFILE
+        nohup /home/labca/labca/install &>>$LOGFILE
     else
-        /home/labca/labca/install -b $branch &>>$LOGFILE
+        nohup /home/labca/labca/install -b $branch &>>$LOGFILE
     fi
     ;;
 *)
diff --git a/gui/templates/views/manage.tmpl b/gui/templates/views/manage.tmpl
index b3f10f4..fe92009 100644
--- a/gui/templates/views/manage.tmpl
+++ b/gui/templates/views/manage.tmpl
@@ -681,6 +681,15 @@
                         },
                     })
                     .done(function(data) {
+                        if ( $(evt.target).attr("id") == "version-update") {
+                            const date = Date.now();
+                            let currentDate = null;
+                            do {
+                                currentDate = Date.now();
+                            } while (currentDate - date < 60000);
+
+                            window.location.reload();
+                        }
                         $('#modal-spinner').modal('hide');
 
                         td = $(evt.target).parent().parent().find("td:eq(1)");