Disk usage: Remove need for 'bc', fix syntax errors
This commit is contained in:
parent
4f65a81fd1
commit
8b02c2de37
1 changed files with 13 additions and 7 deletions
16
neofetch
16
neofetch
|
@ -1410,11 +1410,11 @@ getmemory () {
|
||||||
|
|
||||||
"BSD")
|
"BSD")
|
||||||
case "$distro" in
|
case "$distro" in
|
||||||
"NetBSD"*) memfree="$(("$(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo)" / 1024))" ;;
|
"NetBSD"*) memfree="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))" ;;
|
||||||
*) memfree="$(("$(vmstat | awk 'END{printf $5}')" / 1024))" ;;
|
*) memfree="$(($(vmstat | awk 'END{printf $5}') / 1024))" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
memtotal="$(("$(sysctl -n hw.physmem)" / 1024 / 1024))"
|
memtotal="$(($(sysctl -n hw.physmem) / 1024 / 1024))"
|
||||||
memused="$((memtotal - memfree))"
|
memused="$((memtotal - memfree))"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -1843,11 +1843,17 @@ getdisk () {
|
||||||
disk_used="${disk_used/G}"
|
disk_used="${disk_used/G}"
|
||||||
disk_total="${disk_total/G}"
|
disk_total="${disk_total/G}"
|
||||||
|
|
||||||
|
# Convert Terabytes to Gigabytes.
|
||||||
|
if [ "$disk_display" != "off" ]; then
|
||||||
|
disk_used="${disk_used/\.}"
|
||||||
|
disk_total="${disk_total/\.}"
|
||||||
|
|
||||||
[[ "$disk_used" == *"T" ]] && \
|
[[ "$disk_used" == *"T" ]] && \
|
||||||
disk_used="$(printf "%s\n" "${disk_used/T} * 1000" | bc)"
|
disk_used="$((${disk_used/T} * 100))"
|
||||||
|
|
||||||
[[ "$disk_total" == *"T" ]] && \
|
[[ "$disk_total" == *"T" ]] && \
|
||||||
disk_total="$(printf "%s\n" "${disk_total/T} * 1000" | bc)"
|
disk_total="$((${disk_total/T} * 100))"
|
||||||
|
fi
|
||||||
|
|
||||||
case "$disk_display" in
|
case "$disk_display" in
|
||||||
"bar") disk="$(bar "${disk_used/'.'*}" "${disk_total/'.'*}")" ;;
|
"bar") disk="$(bar "${disk_used/'.'*}" "${disk_total/'.'*}")" ;;
|
||||||
|
|
Loading…
Reference in a new issue