diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh index 443278de3..d7cd1e1c7 100755 --- a/home.admin/00infoBlitz.sh +++ b/home.admin/00infoBlitz.sh @@ -19,6 +19,7 @@ source <(/home/admin/_cache.sh get \ system_ups_status \ system_ups_battery \ system_cpu_load \ + system_up_text \ system_temp_celsius \ system_temp_fahrenheit \ runBehindTor \ @@ -311,7 +312,8 @@ if [ "${blitzapi}" == "on" ]; then webuiinfo="Web Admin --> http://${internet_localip}" fi -datetime=$(date -R) +datetime=$(date +"%d %b %T %z") +datetime="${datetime} up ${system_up_text}" stty sane sleep 1 diff --git a/home.admin/_background.scan.sh b/home.admin/_background.scan.sh index 88e49c823..b9f2cd5ff 100755 --- a/home.admin/_background.scan.sh +++ b/home.admin/_background.scan.sh @@ -141,7 +141,9 @@ do # uptime just do on every run system_up=$(cat /proc/uptime | grep -o '^[0-9]\+') + system_up_text=$(uptime -p | cut -d ' ' -f 2- | cut -d ',' -f 1 | awk '{print $1 substr($2, 1, 1)}') /home/admin/_cache.sh set system_up "${system_up}" + /home/admin/_cache.sh set system_up_text "${system_up_text}" # cpu load cpu_load=$(w | head -n 1 | cut -d 'v' -f2 | cut -d ':' -f2)