Add release branch to v-list-sys-info

Author: Kristan Kenney

bin/v-list-sys-info

@@ -17,6 +17,7 @@ source $HESTIA/func/main.sh
 
 # Retrieve Hestia Control Panel version number
 HESTIA_VERSION=$(grep VERSION $HESTIA/conf/hestia.conf | cut -d '=' -f2 | sed "s|'||g")
+HESTIA_RELEASE=$(grep RELEASE_BRANCH $HESTIA/conf/hestia.conf | cut -d '=' -f2 | sed "s|'||g")
 
 # JSON list function
 json_list() {
@@ -27,6 +28,7 @@ json_list() {
         "VERSION": "'$VERSION'",
         "ARCH": "'$ARCH'",
         "HESTIA": "'$HESTIA_VERSION'",
+        "RELEASE": "'$HESTIA_RELEASE'",
         "UPTIME": "'$UPTIME'",
         "LOADAVERAGE": "'$LOADAVERAGE'"
         }'
@@ -35,20 +37,20 @@ json_list() {
 
 # SHELL list function
 shell_list() {
-    echo "HOSTNAME   OS   VER   ARCH  HESTIA  UPTIME   LA"
-    echo "--------   --   ---   ----  ------  ------   --"
-    echo "$HOSTNAME $OS $VERSION $ARCH $HESTIA_VERSION $UPTIME $LOADAVERAGE"
+    echo "HOSTNAME   OS   VER   ARCH  HESTIA  RELEASE  UPTIME   LA"
+    echo "--------   --   ---   ----  ------  -------  ------   --"
+    echo "$HOSTNAME $OS $VERSION $ARCH $HESTIA_VERSION $HESTIA_RELEASE $UPTIME $LOADAVERAGE"
 }
 
 # PLAIN list function
 plain_list() {
-    echo -e "$HOSTNAME\t$OS\t$VERSION\t$ARCH\t$HESTIA_VERSION\t$UPTIME\t$LOADAVERAGE"
+    echo -e "$HOSTNAME\t$OS\t$VERSION\t$ARCH\t$HESTIA_VERSION\t$HESTIA_RELEASE\t$UPTIME\t$LOADAVERAGE"
 }
 
 # CSV list function
 csv_list() {
-    echo "HOSTNAME,OS,VERSION,ARCH,HESTIA,UPTIME,LOADAVERAGE"
-    echo "$HOSTNAME,$OS,$VERSION,$ARCH,$HESTIA_VERSION,$UPTIME,$LOADAVERAGE"
+    echo "HOSTNAME,OS,VERSION,ARCH,HESTIA,RELEASE,UPTIME,LOADAVERAGE"
+    echo "$HOSTNAME,$OS,$VERSION,$ARCH,$HESTIA_VERSION,$HESTIA_RELEASE,$UPTIME,$LOADAVERAGE"
 }
 
 

web/templates/admin/list_services.html

@@ -53,7 +53,7 @@
                <td>
                   <div class="l-unit__stat-cols clearfix">
                     <div class="l-unit__stat-col l-unit__stat-col--left wide"><b><?=__('Hestia Control Panel')?>:</b></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right">v<?=$sys['sysinfo']['HESTIA']?> <? if(<?php echo $_SESSION['RELEASE_BRANCH']; ?><i class="fas fa-flask icon-large status-icon orange"></i> (<?php echo $_SESSION['RELEASE_BRANCH']; ?>)</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--right">v<?=$sys['sysinfo']['HESTIA']?> <? if($sys['sysinfo']['RELEASE'] != 'release'){ ?><i class="fas fa-flask icon-large status-icon orange"></i> (<?php echo $_SESSION['RELEASE_BRANCH']; ?>)</div>
                   </div>
                 </td>
                 <td>