v8.08.171007 => Bugfix (#74)

no big changes. Fix for #70 and more space for fields in 16 color themes
OutsideIT · Oct 7, 2017 · 30673a9 · 30673a9
1 parent b640fff
commit 30673a9
Showing 1 changed file with 31 additions and 25 deletions.
diff --git a/FireMotD b/FireMotD
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Script name:  FireMotD
-# Version:      v8.06.171007
+# Version:      v8.08.171007
 # Created on:   10/02/2014
 # Author:       Willem D'Haese
 # Contributors: Gustavo Neves, Thomas Dietrich, Dmitry Romanenko
@@ -365,8 +365,7 @@ ExploreMemory () {
     MemTotalB="$(< /proc/meminfo grep MemTotal | awk '{print $2}')"
     MemTotalGB="$(printf "%0.2f\n" "$(bc -q <<< scale=2\;"$MemTotalB"/1024/1024)")"
     ProcpsVersion="$(free --version | awk '{ print $4 }')"
-    VersionComparison 3.3.9 "$ProcpsVersion"
-
+    VersionComparison 3.3.9 "$ProcpsVersion"    
     if [ $? -lt 2 ] ; then
         MemFreeB="$(free | grep buffers/cache | awk '{print $4}')"
         MemUsedB="$(free | grep buffers/cache | awk '{print $3}')"
@@ -376,7 +375,6 @@ ExploreMemory () {
         MemUsedB=$(echo "$MemBuffCacheB+$MemFreeUsedB" | bc)
         MemFreeB="$(free | awk '/Mem:/ { print $4 }')"
     fi
-
     MemFreeGB="$(printf "%0.2f\n" "$(bc -q <<< scale=2\;"$MemFreeB"/1024/1024)")"
     MemUsedGB="$(printf "%0.2f\n" "$(bc -q <<< scale=2\;"$MemUsedB"/1024/1024)")"
     MemFreePerc=$(echo "scale=2; $MemFreeB*100/$MemTotalB" | bc)
@@ -730,6 +728,8 @@ StartOrangeTheme () {
         HostName=${HostName:0:39}
         HostChars=47
     fi
+    LeftoverChars=$((MaxLeftOverChars - HostChars -10))
+    (( $LeftoverChars <= 0 )) && LeftoverChars=0
     C1C=$(( 79 - 4 - 10 - HostChars - 4 ))                                                    
     WriteLog Verbose Info "Row 1 Rest Chars: $C1C"                                            
     C2C=$(( 79 - 4 - 4 - 9 - HostChars - 9 - 6 ))                                             
@@ -777,6 +777,8 @@ StartGrayTheme () {
         HostName=${HostName:0:39}
         HostChars=47
     fi
+    LeftoverChars=$((MaxLeftOverChars - HostChars -10))
+    (( $LeftoverChars <= 0 )) && LeftoverChars=0
     C1C=$(( 79 - 4 - 10 - HostChars - 4 ))
     WriteLog Verbose Info "Row 1 Rest Chars: $C1C"
     C2C=$(( 79 - 4 - 4 - 9 - HostChars - 9 - 6 ))
@@ -938,7 +940,7 @@ GenerateOriginal256Color () {
     HostName=$(jq -r ".HostName.Value" $ExportFile)
     if [[ "$HostName" != "null" ]] && [[ "$HostName" != "" ]] ; then
         echo -e "$BlueScheme$LongBlueScheme$BlueScheme$ShortBlueScheme
-$BlueScheme \e[38;5;93m $HostName $BlueScheme $Space\e[38;5;98m$SVC$ShownVersion
+$BlueScheme \e[38;5;93m $HostName $ShortBlueScheme $Space\e[38;5;98m$SVC$ShownVersion
 $BlueScheme$LongBlueScheme$BlueScheme$ShortBlueScheme"
     fi
     HostIp=$(jq -r ".HostIp.Value" $ExportFile)
@@ -1015,7 +1017,7 @@ $BlueScheme$LongBlueScheme$BlueScheme$ShortBlueScheme"
     ProcessCount=$(jq -r ".Processes.Count" $ExportFile)
     ProcessMax=$(jq -r ".Processes.Max" $ExportFile)
     if [[ ! -z $ProcessCount ]] && [[ "$ProcessCount" != "null" ]] ; then
-        echo -e "\e[0;38;5;17m$Fto    \e[38;5;39mProcesses  \e[38;5;93m= \e[38;5;33m$ProcessCount\e[38;5;27m running processes of \e[38;5;33m$ProcessMax\e[38;5;27m maximum processes"
+        echo -e "\e[0;38;5;17m$Fto     \e[38;5;39mProcesses \e[38;5;93m= \e[38;5;33m$ProcessCount\e[38;5;27m running processes of \e[38;5;33m$ProcessMax\e[38;5;27m maximum processes"
     fi
     HttpdVersion=$(jq -r ".Httpd.Version" $ExportFile)
     if [[ ! -z $HttpdVersion ]] && [[ "$HttpdVersion" != "null" ]] ; then
@@ -1062,101 +1064,105 @@ $CP1$CP1$CP12$CP1H$C1R$CP1$CP1"
     fi
     HostIp=$(jq -r ".HostIp.Value" $ExportFile)
     if [[ ! -z $HostIp ]] && [[ "$HostIp" != "null" ]] ; then
-        echo -e "$CP1        ${KS}Ip $ES ${VCL}$HostIp"
+        echo -e "$CP1             ${KS}Ip $ES ${VCL}$HostIp"
     fi
     Release=$(jq -r ".Release.Value" $ExportFile)
     if [[ ! -z $Release ]] && [[ "$Release" != "null" ]] ; then
-        echo -e "$CP1   ${KS}Release $ES ${VC}$Release"
+        echo -e "$CP1        ${KS}Release $ES ${VC}$Release"
     fi
     Kernel=$(jq -r ".Kernel.Value" $ExportFile)
     if [[ ! -z $Kernel ]] && [[ "$Kernel" != "null" ]] ; then
-        echo -e "$CP1    ${KS}Kernel $ES ${VC}$Kernel"
+        echo -e "$CP1         ${KS}Kernel $ES ${VC}$Kernel"
     fi
     Platform=$(jq -r ".Platform.Value" $ExportFile)
     if [[ ! -z $Platform ]] && [[ "$Platform" != "null" ]] ; then
-        echo -e "$CP1  ${KS}Platform $ES ${VC}$Platform"
+        echo -e "$CP1       ${KS}Platform $ES ${VC}$Platform"
     fi
     UptimeDays=$(jq -r ".Uptime.Days" $ExportFile)
     UptimeHours=$(jq -r ".Uptime.Hours" $ExportFile)
     UptimeMinutes=$(jq -r ".Uptime.Minutes" $ExportFile)
     UptimeSeconds=$(jq -r ".Uptime.Seconds" $ExportFile)
     if [[ ! -z $UptimeDays ]] && [[ "$UptimeDays" != "null" ]] ; then
-        echo -e "$CP1    ${KS}Uptime $ES ${VCL}${UptimeDays} ${VC}day(s). ${VCL}${UptimeHours}${VC}:${VCL}${UptimeMinutes}${VC}:${VCL}${UptimeSeconds}"
+        echo -e "$CP1         ${KS}Uptime $ES ${VCL}${UptimeDays} ${VC}day(s). ${VCL}${UptimeHours}${VC}:${VCL}${UptimeMinutes}${VC}:${VCL}${UptimeSeconds}"
     fi
     InstallDate=$(jq -r ".InstallDate.Value" $ExportFile)
     if [[ ! -z $InstallDate ]] && [[ "$InstallDate" != "null" ]] ; then
-        echo -e "$CP1 ${KS}Installed $ES ${VC}$InstallDate"
+        echo -e "$CP1      ${KS}Installed $ES ${VC}$InstallDate"
     fi
     CpuUsageAverage=$(jq -r ".CpuUsage.Average" $ExportFile)
     CpuUsageCpuCount=$(jq -r ".CpuUsage.CpuCount" $ExportFile)
     CpuUsageCoreCount=$(jq -r ".CpuUsage.CoreCount" $ExportFile)
     CpuUsageSocketCount=$(jq -r ".CpuUsage.SocketCount" $ExportFile)
     if [[ ! -z $CpuUsageAverage ]] && [[ "$CpuUsageAverage" != "null" ]] ; then
-        echo -e "$CP1 ${KS}CPU Usage $ES ${VCL}$CpuUsageAverage ${VC}% avg over ${VCL}${CpuUsageCpuCount}${VC} cpu(s)  ($CpuUsageCoreCount core(s) x $CpuUsageSocketCount socket(s))"
+        echo -e "$CP1      ${KS}CPU Usage $ES ${VCL}$CpuUsageAverage ${VC}% avg over ${VCL}${CpuUsageCpuCount}${VC} cpu(s)  ($CpuUsageCoreCount core(s) x $CpuUsageSocketCount socket(s))"
     fi
     CpuLoad=$(jq -r ".CpuLoad.Value" $ExportFile)
     if [[ ! -z $CpuLoad ]] && [[ "$CpuLoad" != "null" ]] ; then
-        echo -e "$CP1  ${KS}CPU Load $ES ${VC}$CpuLoad"
+        echo -e "$CP1       ${KS}CPU Load $ES ${VC}$CpuLoad"
     fi
     MemTotalGB=$(jq -r ".Memory.TotalGB" $ExportFile)
     MemFreeGB=$(jq -r ".Memory.FreeGB" $ExportFile)
     MemUsedGB=$(jq -r ".Memory.UsedGB" $ExportFile)
     MemFreePerc=$(jq -r ".Memory.FreePerc" $ExportFile)
     MemUsedPerc=$(jq -r ".Memory.UsedPerc" $ExportFile)
     if [[ ! -z $MemTotalGB ]] && [[ "$MemTotalGB" != "null" ]] ; then
-        echo -e "$CP1    ${KS}Memory $ES ${VC}Free: ${VCL}${MemFreeGB}${VC}GB (${VCL}$MemFreePerc${VC}%), Used: ${VCL}${MemUsedGB}${VC}GB (${VCL}$MemUsedPerc${VC}%), Total: ${VCL}${MemTotalGB}${VC}GB"
+        echo -e "$CP1         ${KS}Memory $ES ${VC}Free: ${VCL}${MemFreeGB}${VC}GB (${VCL}$MemFreePerc${VC}%), Used: ${VCL}${MemUsedGB}${VC}GB (${VCL}$MemUsedPerc${VC}%), Total: ${VCL}${MemTotalGB}${VC}GB"
     fi
     SwapTotalGB=$(jq -r ".Swap.TotalGB" $ExportFile)
     SwapFreeGB=$(jq -r ".Swap.FreeGB" $ExportFile)
     SwapUsedGB=$(jq -r ".Swap.UsedGB" $ExportFile)
     SwapFreePerc=$(jq -r ".Swap.FreePerc" $ExportFile)
     SwapUsedPerc=$(jq -r ".Swap.UsedPerc" $ExportFile)
     if [[ ! -z $SwapTotalGB ]] && [[ "$SwapTotalGB" != "null" ]] ; then
-        echo -e "$CP1      ${KS}Swap $ES ${VC}Free: ${VCL}${SwapFreeGB}${VC}GB (${VCL}$SwapFreePerc${VC}%), Used: ${VCL}${SwapUsedGB}${VC}GB (${VCL}$SwapUsedPerc${VC}%), Total: ${VCL}${SwapTotalGB}${VC}GB"
+        echo -e "$CP1           ${KS}Swap $ES ${VC}Free: ${VCL}${SwapFreeGB}${VC}GB (${VCL}$SwapFreePerc${VC}%), Used: ${VCL}${SwapUsedGB}${VC}GB (${VCL}$SwapUsedPerc${VC}%), Total: ${VCL}${SwapTotalGB}${VC}GB"
     fi
     DiskRootTotalGB=$(jq -r ".DiskRoot.TotalGB" $ExportFile)
     DiskRootFreeGB=$(jq -r ".DiskRoot.FreeGB" $ExportFile)
     DiskRootUsedGB=$(jq -r ".DiskRoot.UsedGB" $ExportFile)
     DiskRootFreePerc=$(jq -r ".DiskRoot.FreePerc" $ExportFile)
     DiskRootUsedPerc=$(jq -r ".DiskRoot.UsedPerc" $ExportFile)
     if [[ ! -z $DiskRootTotalGB ]] && [[ "$DiskRootTotalGB" != "null" ]] ; then
-        echo -e "$CP1      ${KS}Root $ES ${VC}Free: ${VCL}${DiskRootFreeGB}${VC}GB (${VCL}$DiskRootFreePerc${VC}%), Used: ${VCL}${DiskRootUsedGB}${VC}GB (${VCL}$DiskRootUsedPerc${VC}%), Total: ${VCL}${DiskRootTotalGB}${VC}GB"
+        echo -e "$CP1           ${KS}Root $ES ${VC}Free: ${VCL}${DiskRootFreeGB}${VC}GB (${VCL}$DiskRootFreePerc${VC}%), Used: ${VCL}${DiskRootUsedGB}${VC}GB (${VCL}$DiskRootUsedPerc${VC}%), Total: ${VCL}${DiskRootTotalGB}${VC}GB"
     fi
     UpdateCount=$(jq -r ".Updates.Count" $ExportFile)
     UpdateType=$(jq -r ".Updates.Type" $ExportFile)
     if [[ ! -z $UpdateCount ]] && [[ "$UpdateCount" != "null" ]] ; then
-        echo -e "$CP1   ${KS}Updates $ES ${VCL}$UpdateCount${VC} ${UpdateType} updates available."
+        echo -e "$CP1        ${KS}Updates $ES ${VCL}$UpdateCount${VC} ${UpdateType} updates available."
     fi
     SessionCount=$(jq -r ".Sessions.Count" $ExportFile)
     if [[ ! -z $SessionCount ]] && [[ "$SessionCount" != "null" ]] ; then
-        echo -e "$CP1  ${KS}Sessions $ES ${VCL}$SessionCount"
+        echo -e "$CP1       ${KS}Sessions $ES ${VCL}$SessionCount"
     fi
     ProcessCount=$(jq -r ".Processes.Count" $ExportFile)
     ProcessMax=$(jq -r ".Processes.Max" $ExportFile)
     if [[ ! -z $ProcessCount ]] && [[ "$ProcessCount" != "null" ]] ; then
-        echo -e "$CP1 ${KS}Processes $ES ${VCL}$ProcessCount ${VC}running processes of ${VCL}$ProcessMax ${VC}maximum processes"
+        echo -e "$CP1      ${KS}Processes $ES ${VCL}$ProcessCount ${VC}running processes of ${VCL}$ProcessMax ${VC}maximum processes"
     fi
     HttpdVersion=$(jq -r ".Httpd.Version" $ExportFile)
     if [[ ! -z $HttpdVersion ]] && [[ "$HttpdVersion" != "null" ]] ; then
-        echo -e "$CP1    ${KS}Apache $ES ${VC}Version: ${VCL}$HttpdVersion"
+        echo -e "$CP1         ${KS}Apache $ES ${VC}Version: ${VCL}$HttpdVersion"
     fi
     NginxVersion=$(jq -r ".Nginx.Version" $ExportFile)
     if [[ ! -z $NginxVersion ]] && [[ "$NginxVersion" != "null" ]] ; then
-        echo -e "$CP1     ${KS}Nginx $ES ${VC}Version: ${VCL}$nginxVersion"
+        echo -e "$CP1          ${KS}Nginx $ES ${VC}Version: ${VCL}$nginxVersion"
     fi
     MysqlVersion=$(jq -r ".Mysql.Version" $ExportFile)
     MysqlDistribution=$(jq ".Mysql.Distribution" $ExportFile)
     if [[ ! -z $MysqlVersion ]] && [[ "$MysqlVersion" != "null" ]] ; then
-        echo -e "$CP1     ${KS}MySQL $ES ${VC}Version: ${VCL}$MysqlVersion ${VC}Distribution: ${VCL}$MysqlDistribution"
+        echo -e "$CP1          ${KS}MySQL $ES ${VC}Version: ${VCL}$MysqlVersion ${VC}Distribution: ${VCL}$MysqlDistribution"
     fi
     PostgresVersion=$(jq -r ".Postgres.Version" $ExportFile)
     if [[ ! -z $PostgresVersion ]] && [[ "$PostgresVersion" != "null" ]] ; then
-        echo -e "$CP1  ${KS}Postgres $ES ${VC}Version: ${VCL}$PostgreSqlVersion"
+        echo -e "$CP1       ${KS}Postgres $ES ${VC}Version: ${VCL}$PostgreSqlVersion"
     fi
     PhpVersion=$(jq -r ".Php.Version" $ExportFile)
     PhpMaxMemory=$(jq -r ".Php.MaxMemory" $ExportFile)
     if [[ ! -z $PhpVersion ]] && [[ "$PhpVersion" != "null" ]] ; then
-        echo -e "$CP1       ${KS}PHP $ES ${VC}Version: ${VCL}$PhpVersion, ${VC}Memory Limit: ${VCL}$PhpMaxMemory"
+        echo -e "$CP1            ${KS}PHP $ES ${VC}Version: ${VCL}$PhpVersion, ${VC}Memory Limit: ${VCL}$PhpMaxMemory"
+    fi
+    ElasticsearchVersion=$(jq -r ".Elasticsearch.Version" $ExportFile)
+    if [[ ! -z $ElasticsearchVersion ]] && [[ "$ElasticsearchVersion" != "Unknown" ]] && [[ "$ElasticsearchVersion" != "null" ]] ; then
+      echo -e "$CP1  ${KS}Elasticsearch $ES ${VC}Version: ${VCL}$ElasticsearchVersion"
     fi
     echo -e "$CP1$CP1$CZR$CP1$CP1\e[0;37m"
 }