diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh index 695bb205..8000d330 100755 --- a/home.admin/00infoBlitz.sh +++ b/home.admin/00infoBlitz.sh @@ -1,5 +1,7 @@ #!/bin/bash +source /home/admin/raspiblitz.info + source <(/home/admin/_cache.sh get \ state \ setupPhase \ @@ -315,6 +317,12 @@ fi datetime=$(date +"%d %b %T %z") datetime="${datetime} up ${system_up_text}" +if [ "${vm}" == "1" ]; then + temp_info="VM detected" +else + temp_info="temp ${system_temp_celsius}°C ${system_temp_fahrenheit}°F" +fi + stty sane sleep 1 clear @@ -327,7 +335,7 @@ ${color_yellow} ${color_amber}%s ${color_green} ${ln_alias} ${upsI ${color_yellow} ${color_gray}${network^} Fullnode${LNinfo} ${torInfo} ${color_yellow} ,/ ${color_yellow}%s ${color_yellow} ,'/ ${color_gray}%s -${color_yellow} ,' / ${color_gray}%s, temp %s°C %s°F +${color_yellow} ,' / ${color_gray}%s ${temp_info} ${color_yellow} ,' /_____ ${color_gray}Free Mem ${color_ram}${ram} ${color_gray} HDD ${color_hdd}%s${color_gray} ${color_yellow},'_____ ,' ${color_gray}SSH admin@${internet_localip}${color_gray} d${internet_rx} u${internet_tx} ${color_yellow} / ,' ${color_gray}${webuiinfo} @@ -342,7 +350,7 @@ $lastLine "RaspiBlitz v${codeVersion}" \ "-------------------------------------------" \ "Refreshed: ${datetime}" \ -"CPU load${system_cpu_load##up*, }" "${system_temp_celsius}" "${system_temp_fahrenheit}" \ +"CPU load${system_cpu_load##up*, }" \ "${hdd_used_info}" "${sync_percentage}" if [ ${#undervoltageReports} -gt 0 ] && [ "${undervoltageReports}" != "0" ]; then diff --git a/home.admin/setup.scripts/eventBlockchainSync.sh b/home.admin/setup.scripts/eventBlockchainSync.sh index e0c01b26..eec8d333 100644 --- a/home.admin/setup.scripts/eventBlockchainSync.sh +++ b/home.admin/setup.scripts/eventBlockchainSync.sh @@ -104,4 +104,9 @@ fi # display info to user time=$(date '+%H:%M:%S') -dialog --title " Node is Syncing (${time}) " --backtitle "${codeVersion} / ${internet_localip} ${system_temp_celsius}°C ${system_temp_fahrenheit}°F / ${hdd_used_info}" --infobox "${infoStr}\n ${adminStr}" ${height} ${width} \ No newline at end of file +if [ "${vm}" == "0" ]; then + temp_info="${system_temp_celsius}°C ${system_temp_fahrenheit}°F" +else + temp_info="VM" +fi +dialog --title " Node is Syncing (${time}) " --backtitle "${codeVersion} / ${internet_localip} ${temp_info} / ${hdd_used_info}" --infobox "${infoStr}\n ${adminStr}" ${height} ${width} \ No newline at end of file diff --git a/home.admin/setup.scripts/eventInfoWait.sh b/home.admin/setup.scripts/eventInfoWait.sh index b104a2f2..bc84fb65 100644 --- a/home.admin/setup.scripts/eventInfoWait.sh +++ b/home.admin/setup.scripts/eventInfoWait.sh @@ -33,8 +33,14 @@ if [ "${mode}" != "lcd" ] && [ "${mode}" != "ssh" ]; then exit 1 fi +if [ "${vm}" == "1" ]; then + temp_info="VM" +else + temp_info="${system_temp_celsius}°C" +fi + # default backtitle for dialog -backtitle="${codeVersion} ${eventID} / ${internet_localip} ${system_temp_celsius}°C ${hdd_used_info}" +backtitle="${codeVersion} ${eventID} / ${internet_localip} ${temp_info} ${hdd_used_info}" ################################################ # 1) WELL DEFINED EVENTS