From 1a02b6d768fe080ae51cf5f3c0ddf103ae97eb11 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 18 Jan 2024 11:42:37 +0100
Subject: [PATCH 1/3] chg: [LAUNCH] Addded a "restart" option, killAll +
 launchAuto

---
 bin/LAUNCH.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/LAUNCH.sh b/bin/LAUNCH.sh
index 68c20ac7..05540d3c 100755
--- a/bin/LAUNCH.sh
+++ b/bin/LAUNCH.sh
@@ -69,6 +69,7 @@ function helptext {
     LAUNCH.sh
       [-l  | --launchAuto]         LAUNCH DB + Scripts
       [-k  | --killAll]            Kill DB + Scripts
+      [-kl  | --killLaunch]        Kill All & launchAuto
       [-ks | --killscript]         Scripts
       [-u  | --update]             Update AIL
       [-ut | --thirdpartyUpdate]   Update UI/Frontend
@@ -695,6 +696,9 @@ while [ "$1" != "" ]; do
                                         ;;
         -k | --killAll )                killall;
                                         ;;
+        -kl | --killLaunch )            killall;
+                                        launch_all "automatic";
+                                        ;;
         -ks | --killscript )            killscript;
                                         ;;
         -m | --menu )                   menu_display;

From 9cfd2306611d1d6b6a9d9c34af9bb75a864b5705 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 18 Jan 2024 11:53:13 +0100
Subject: [PATCH 2/3] chg: [LAUNCH] make sure reload works

---
 bin/LAUNCH.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/bin/LAUNCH.sh b/bin/LAUNCH.sh
index 05540d3c..58c17d87 100755
--- a/bin/LAUNCH.sh
+++ b/bin/LAUNCH.sh
@@ -31,15 +31,19 @@ export PATH=$AIL_KVROCKS:$PATH
 export PATH=$AIL_BIN:$PATH
 export PATH=$AIL_FLASK:$PATH
 
-isredis=`screen -ls | egrep '[0-9]+.Redis_AIL' | cut -d. -f1`
-isardb=`screen -ls | egrep '[0-9]+.ARDB_AIL' | cut -d. -f1`
-iskvrocks=`screen -ls | egrep '[0-9]+.KVROCKS_AIL' | cut -d. -f1`
-islogged=`screen -ls | egrep '[0-9]+.Logging_AIL' | cut -d. -f1`
-is_ail_core=`screen -ls | egrep '[0-9]+.Core_AIL' | cut -d. -f1`
-is_ail_2_ail=`screen -ls | egrep '[0-9]+.AIL_2_AIL' | cut -d. -f1`
-isscripted=`screen -ls | egrep '[0-9]+.Script_AIL' | cut -d. -f1`
-isflasked=`screen -ls | egrep '[0-9]+.Flask_AIL' | cut -d. -f1`
-isfeeded=`screen -ls | egrep '[0-9]+.Feeder_Pystemon' | cut -d. -f1`
+function isup {
+    isredis=`screen -ls | egrep '[0-9]+.Redis_AIL' | cut -d. -f1`
+    isardb=`screen -ls | egrep '[0-9]+.ARDB_AIL' | cut -d. -f1`
+    iskvrocks=`screen -ls | egrep '[0-9]+.KVROCKS_AIL' | cut -d. -f1`
+    islogged=`screen -ls | egrep '[0-9]+.Logging_AIL' | cut -d. -f1`
+    is_ail_core=`screen -ls | egrep '[0-9]+.Core_AIL' | cut -d. -f1`
+    is_ail_2_ail=`screen -ls | egrep '[0-9]+.AIL_2_AIL' | cut -d. -f1`
+    isscripted=`screen -ls | egrep '[0-9]+.Script_AIL' | cut -d. -f1`
+    isflasked=`screen -ls | egrep '[0-9]+.Flask_AIL' | cut -d. -f1`
+    isfeeded=`screen -ls | egrep '[0-9]+.Feeder_Pystemon' | cut -d. -f1`
+}
+
+isup
 
 function helptext {
     echo -e $YELLOW"
@@ -69,7 +73,7 @@ function helptext {
     LAUNCH.sh
       [-l  | --launchAuto]         LAUNCH DB + Scripts
       [-k  | --killAll]            Kill DB + Scripts
-      [-kl  | --killLaunch]        Kill All & launchAuto
+      [-kl | --killLaunch]         Kill All & launchAuto
       [-ks | --killscript]         Scripts
       [-u  | --update]             Update AIL
       [-ut | --thirdpartyUpdate]   Update UI/Frontend
@@ -697,6 +701,7 @@ while [ "$1" != "" ]; do
         -k | --killAll )                killall;
                                         ;;
         -kl | --killLaunch )            killall;
+                                        isup;
                                         launch_all "automatic";
                                         ;;
         -ks | --killscript )            killscript;

From deb89db8188960ee871ed0fff9c67344ecdb2f58 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 1 Feb 2024 09:58:21 +0100
Subject: [PATCH 3/3] fix: [ui] Do not show relNotes link if not on a tag

---
 var/www/modules/settings/templates/settings_index.html | 4 ++++
 var/www/templates/settings/settings_index.html         | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/var/www/modules/settings/templates/settings_index.html b/var/www/modules/settings/templates/settings_index.html
index b6a3fdf7..4dbdce42 100644
--- a/var/www/modules/settings/templates/settings_index.html
+++ b/var/www/modules/settings/templates/settings_index.html
@@ -43,7 +43,11 @@
                       <tbody>
                         <tr>
                           <td>AIL Version</td>
+                          {%if ail_version is not none %}
                           <td>{{current_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{current_version}}" class="text-info"><small> (release note)</small></a></td>
+			  {%else%}
+                          <td>{{git_metadata['current_branch']}}</td>
+                          {%endif%}
                         </tr>
                         <tr
                         {%if git_metadata['current_branch'] != 'master'%}
diff --git a/var/www/templates/settings/settings_index.html b/var/www/templates/settings/settings_index.html
index dbdd6843..63a92d55 100644
--- a/var/www/templates/settings/settings_index.html
+++ b/var/www/templates/settings/settings_index.html
@@ -43,7 +43,11 @@
                       <tbody>
                         <tr>
                           <td>AIL Version</td>
+                          {%if ail_version is not none %}
                           <td>{{ail_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{ail_version}}" class="text-info"><small> (release note)</small></a></td>
+			  {%else%}
+                          <td>{{git_metadata['current_branch']}}</td>
+                          {%endif%}
                         </tr>
                         <tr
                         {%if git_metadata['current_branch'] != 'master'%}