enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some 30-armbian-sysinfo fixes (#2732)

Browse Source 
* Update 30-armbian-sysinfo

Fixed alignment of "Local users" and "IP" in third column.
Made it more compact by adding extra new line.
Added "both" traffic direction.
Removed "-h" vnstat argument because it doesn't do anything, changed "last 24h" to "today" (there is only "rx/tx for today" in --oneline output).

* Update armbian-motd.dpkg-dist

Add PRIMARY_DIRECTION description

* Update 30-armbian-sysinfo

fix new line logic
clean-up unused variables
This commit is contained in:
NekoB0x 2021-03-24 20:19:38 +02:00 committed by GitHub
parent d203ffee29
commit 271756dcc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/bsp/common/etc/default/armbian-motd.dpkg-dist
View File

@ -2,6 +2,7 @@
# Example:
# MOTD_DISABLE="header tips updates"
# ONE_WIRE="yes" show 1-wire temperature sensor if attached
# PRIMARY_DIRECTION="rx" show daily traffic stats, options: "rx", "tx", "both", "off", vnstat needs to be installed
MOTD_DISABLE=""
ONE_WIRE=""

46
packages/bsp/common/etc/update-motd.d/30-armbian-sysinfo
View File

@ -202,7 +202,7 @@ swap_total=$(awk '{print $(2)}' <<<${swap_info})
# display info
display "System load" "${load%% *}" "${critical_load}" "0" "%" ""
printf "Up time: \x1B[92m%s\x1B[0m\t\t" "$time"
printf "Up time: \x1B[92m%s\x1B[0m\t" "$time"
display "Local users" "${users##* }" "3" "2" ""
echo "" # fixed newline
if [[ ${memory_total} -gt 1000 ]]; then
@ -219,32 +219,42 @@ fi
display "Memory usage" "$memory_usage" "70" "0" "%" " of ${memory_total}"
display "Zram usage" "$swap_usage" "75" "0" "%" " of ${swap_total}"
printf "IP: "
printf "IP: "
printf "\x1B[92m%s\x1B[0m" "$ip_address"
echo "" # fixed newline
a=0;b=0;c=0
display "CPU temp" "$board_temp" $CPU_TEMP_LIMIT "0" "°C" ""
display "Ambient temp" "$amb_temp" $AMB_TEMP_LIMIT "0" "°C" "" ; a=$?
(( ($a+$b) >0 )) && echo "" # new line only if some value is displayed
display "Ambient temp" "$amb_temp" $AMB_TEMP_LIMIT "0" "°C" ""
display "Usage of /" "$root_usage" "90" "1" "%" " of $root_total"
display "storage/" "$storage_usage" "90" "1" "%" " of $storage_total"
display "storage temp" "$storage_temp" $HDD_TEMP_LIMIT "0" "°C" "" ; a=$?
display "Battery" "$battery_percent" "20" "1" "%" "$status_battery_text"
echo ""
echo "" # fixed newline
a=0
display "storage/" "$storage_usage" "90" "1" "%" " of $storage_total" ; a=$((a+$?))
display "storage temp" "$storage_temp" $HDD_TEMP_LIMIT "0" "°C" "" ; a=$((a+$?))
display "Battery" "$battery_percent" "20" "1" "%" "$status_battery_text" ; a=$((a+$?))
(( $a > 0 )) && echo "" # new line only if some value is displayed
line=0
if [[ $(command -v vnstat) ]]; then
line=$((line+1))
traffic=$(vnstat -h -i $PRIMARY_INTERFACE --oneline | cut -d";" -f4,5)
traffic=$(vnstat -i $PRIMARY_INTERFACE --oneline | cut -d";" -f4,5)
traffic_rx=$(echo $traffic | cut -d";" -f1,1 | sed -r 's/([0-9]+\.[0-9]{1})[0-9]*/\1/')
traffic_tx=$(echo $traffic | cut -d";" -f2,2 | sed -r 's/([0-9]+\.[0-9]{1})[0-9]*/\1/')
[[ "$traffic" == *"Not enough"* ]] && { traffic_tx="n/a "; traffic_rx="n/a "; }
printf "${PRIMARY_DIRECTION^^} last 24h: "
if [[ $PRIMARY_DIRECTION == tx ]]; then
printf "\x1B[92m%s\x1B[0m" "$traffic_tx"
else
printf "\x1B[92m%s\x1B[0m" "$traffic_rx"
fi
printf "\t"
case $PRIMARY_DIRECTION in
tx)
printf "TX today: \x1B[92m%s\x1B[0m \t" "$traffic_tx"
line=$((line+1))
;;
rx)
printf "RX today: \x1B[92m%s\x1B[0m \t" "$traffic_rx"
line=$((line+1))
;;
both)
printf "TX today: \x1B[92m%s\x1B[0m \t" "$traffic_tx"
printf "RX today: \x1B[92m%s\x1B[0m \t" "$traffic_rx"
line=$((line+1))
;;
*) #off or whatever
;;
esac
fi
if [[ $(command -v zpool) ]]; then