Merge pull request #202 from SteveClement/dev

chg: [LAUNCH] Addded a "restart" option, killAll + launchAuto

bin/LAUNCH.sh

@@ -31,6 +31,7 @@ export PATH=$AIL_KVROCKS:$PATH
 export PATH=$AIL_BIN:$PATH
 export PATH=$AIL_FLASK:$PATH
 
+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`
@@ -40,6 +41,9 @@ 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,6 +73,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
@@ -692,6 +697,10 @@ while [ "$1" != "" ]; do
                                         ;;
         -k | --killAll )                killall;
                                         ;;
+        -kl | --killLaunch )            killall;
+                                        isup;
+                                        launch_all "automatic";
+                                        ;;
         -ks | --killscript )            killscript;
                                         ;;
         -m | --menu )                   menu_display;

var/www/modules/settings/templates/settings_index.html

@@ -43,8 +43,10 @@
                       <tbody>
                         <tr>
                           <td>AIL Version</td>
-                          {%if ail_version != 'None'%}
+                          {%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

var/www/templates/settings/settings_index.html

@@ -43,8 +43,10 @@
                       <tbody>
                         <tr>
                           <td>AIL Version</td>
-                          {%if ail_version != 'None'%}
+                          {%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