highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-10-04 12:05:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v1.7

Browse Source
This commit is contained in:
Robert Habermann
2020-09-05 23:10:30 +02:00
parent f36f25e248 a9261fa3aa
commit d913a2075c
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home.admin/00infoBlitz.sh
View File

@@ -85,7 +85,7 @@ else
fi fi
# get name of active interface (eth0 or wlan0) # get name of active interface (eth0 or wlan0)
network_active_if=$(ip addr | grep -v "lo:" | grep 'state UP' | tr -d " " | cut -d ":" -f2 | head -n 1) network_active_if=$(ip route get 255.255.255.255 | awk -- '{print $4}' | head -n 1)
# get network traffic # get network traffic
# ifconfig does not show eth0 on Armbian or in a VM - get first traffic info # ifconfig does not show eth0 on Armbian or in a VM - get first traffic info

14
home.admin/80scanLND.sh
View File

@@ -63,9 +63,11 @@ if [ ${bitcoinActive} -eq 0 ] || [ ${#bitcoinErrorFull} -gt 0 ] || [ "${1}" == "
else else
# output when user login in as admin and bitcoind is not running # output when user login in as admin and bitcoind is not running
if [ ${uptime} -lt 600 ]; then
if [ ${uptime} -gt 600 ] || [ ${#bitcoinErrorFull} -gt 0 ] || [ "${bitcoinErrorShort}" == "Error found in Logs" ] || [ "${1}" == "blockchain-error" ]; then infoStr=" The ${network}d service is starting:\n ${bitcoinErrorShort}\n Please wait at least 10min ..."
elif [[ "${bitcoinErrorFull}" == *"error code: -28"* ]]; then
infoStr=" The ${network}d service is warming up:\n ${bitcoinErrorShort}\n Please wait ..."
elif [ ${#bitcoinErrorFull} -gt 0 ] || [ "${bitcoinErrorShort}" == "Error found in Logs" ] || [ "${1}" == "blockchain-error" ]; then
clear clear
echo "" echo ""
echo "*****************************************" echo "*****************************************"
@@ -95,9 +97,6 @@ if [ ${bitcoinActive} -eq 0 ] || [ ${#bitcoinErrorFull} -gt 0 ] || [ "${1}" == "
echo "-> Have you tried to turn it off and on again? Use command 'restart'" echo "-> Have you tried to turn it off and on again? Use command 'restart'"
echo "" echo ""
exit 1 exit 1
else
infoStr=" The ${network}d service is starting:\n ${bitcoinErrorShort}\n Please wait up to 10min ..."
fi fi
fi fi
@@ -114,7 +113,7 @@ elif [ ${lndActive} -eq 0 ] || [ ${#lndErrorFull} -gt 0 ] || [ "${1}" == "lightn
title="Lightning Info" title="Lightning Info"
if [ ${uptime} -gt 600 ] || [ "${1}" == "lightning-error" ]; then if [ ${uptime} -gt 600 ] || [ "${1}" == "lightning-error" ]; then
if [ ${#lndErrorShort} -gt 0 ]; then if [ ${#lndErrorShort} -gt 0 ]; then
height=6 height=6
lndErrorShort=" ${lndErrorShort}\n" lndErrorShort=" ${lndErrorShort}\n"
fi fi
if [ ${lndActive} -eq 0 ]; then if [ ${lndActive} -eq 0 ]; then
@@ -216,7 +215,6 @@ else
syncProgress="${syncProgress} %" syncProgress="${syncProgress} %"
fi fi
# formatting LIGHTNING SCAN PROGRESS # formatting LIGHTNING SCAN PROGRESS
if [ ${#scanProgress} -eq 0 ]; then if [ ${#scanProgress} -eq 0 ]; then