update output

This commit is contained in:
rootzoll
2021-06-20 16:35:17 +02:00
parent 92408189e5
commit e269f93617
3 changed files with 8 additions and 21 deletions

View File

@@ -316,27 +316,22 @@ printf "
${color_yellow}
${color_yellow}
${color_yellow}
${color_yellow} ${color_amber}%s ${color_green} ${ln_alias} ${upsInfo}
${color_yellow} ${color_amber}RaspiBlitz v${codeVersion} ${color_green} ${ln_alias} ${upsInfo}
${color_yellow} ${color_gray}${network^} Fullnode + Lightning Network ${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}Free Mem ${color_ram}${ram} ${color_gray} HDDuse ${color_hdd}%s${color_gray}
${color_yellow} ,/ ${color_yellow}-------------------------------------------
${color_yellow} ,'/ ${color_gray}Refreshed: ${datetime}
${color_yellow} ,' / ${color_gray}CPU load${load##up*, }, temp ${tempC}°C ${tempF}°F
${color_yellow} ,' /_____, ${color_gray}Free Mem ${color_ram}${ram} ${color_gray} HDDuse ${color_hdd}${hdd}${color_gray}
${color_yellow} .'____ ,' ${color_gray}SSH admin@${color_green}${local_ip}${color_gray} d${network_rx} u${network_tx}
${color_yellow} / ,' ${color_gray}${webinterfaceInfo}
${color_yellow} / ,' ${color_gray}${network} ${color_green}${networkVersion} ${color_gray}${chain}net ${networkConnectionsInfo}
${color_yellow} /,' ${color_gray}Blocks ${blockInfo} ${color_gray}Sync ${sync_color}${sync} %s
${color_yellow} /,' ${color_gray}Blocks ${blockInfo} ${color_gray}Sync ${sync_color}${sync} ${sync_percentage}
${color_yellow} /' ${color_gray}
${color_yellow} ${color_gray}LND ${color_green}${ln_version} ${ln_baseInfo}
${color_yellow} ${color_gray}${ln_channelInfo} ${ln_peersInfo}
${color_yellow} ${color_gray}${ln_feeReport}
$lastLine
" \
"RaspiBlitz v${codeVersion}" \
"-------------------------------------------" \
"Refreshed: ${datetime}" \
"CPU load${load##up*, }" "${tempC}" "${tempF}" \
"${hdd}" "${sync_percentage}"
"
if [ ${#undervoltageReports} -gt 0 ] && [ "${undervoltageReports}" != "0" ]; then
echo "${undervoltageReports} undervoltage reports - run 'Hardware Test' in menu"

View File

@@ -86,7 +86,7 @@ configWifiExists=$(sudo cat /etc/wpa_supplicant/wpa_supplicant.conf 2>/dev/null|
#############################################
# check for internet connection
online=0
if [ ${#dnsServer} -gt 0 ]; then
if [ "${dnsServer}" != "" ]; then
# re-test with user set dns server
online=$(ping ${dnsServer} -c 1 -W 2 | grep -c '1 received')
fi

View File

@@ -217,14 +217,6 @@ Local Network seems OK but no Internet.
Is your router still online?
" 7 43
elif [ "${eventID}" = "noInternet" ]; then
dialog --backtitle "${backtitle}" --cr-wrap --infobox "
Waiting for Internet ...
Local Network seems OK but no Internet.
Is your router still online?
" 7 43
elif [ "${eventID}" == "inspect-hdd" ]; then
dialog --backtitle "${backtitle}" --cr-wrap --infobox "