Add storage to sysinfo

1 files changed, 26 insertions, 7 deletions

diff --git a/lib/subcommands/sysinfo.bash b/lib/subcommands/sysinfo.bash
index 27e6b55..9fcb604 100644
--- a/lib/subcommands/sysinfo.bash
+++ b/lib/subcommands/sysinfo.bash
@@ -8,9 +8,12 @@ subcommand() {
 	local load_1
 	local load_5
 	local load_15
-	local memory_total
 	local memory_free
+	local memory_total
 	local memory_used
+	local storage_free
+	local storage_total
+	local storage_used
 	local uptime
 
 	load_1="$(awk '{ print $1 }' < /proc/loadavg)"
@@ -21,6 +24,19 @@ subcommand() {
 	memory_used=$(( memory_total - memory_free ))
 	uptime="$(awk -F. '{ print $1 }' < /proc/uptime)"
 
+	case "${BASHTARD_PLATFORM[os]}" in
+		freebsd)
+			storage_used="$(df -c | tail -n1 | awk '{ print $3 }')"
+			storage_free="$(df -c | tail -n1 | awk '{ print $4 }')"
+			storage_total=$(( storage_used + storage_free ))
+			;;
+		*)
+			storage_used="$(df --total | tail -n1 | awk '{ print $3 }')"
+			storage_free="$(df --total | tail -n1 | awk '{ print $4 }')"
+			storage_total=$(( storage_used + storage_free ))
+			;;
+	esac
+
 	printf "%-15s %s\n" "etcdir" "$BASHTARD_ETCDIR"
 	printf "%-15s %s\n" "libdir" "$BASHTARD_LIBDIR"
 	printf "%-15s %s\n" "sharedir" "$BASHTARD_SHAREDIR"
@@ -30,16 +46,19 @@ subcommand() {
 		printf "%-15s %s\n" "$key" "${BASHTARD_PLATFORM[$key]}"
 	done
 
-	printf "%-15s %dd %02dh %02dm %02ds\n" "uptime" \
-		"$(( uptime / 60 / 60 / 24 ))" \
-		"$(( uptime / 60 / 60 % 24 ))" \
-		"$(( uptime / 60 % 60 ))" \
-		"$(( uptime % 60 ))"
-	printf "%-15s %3dGi / %3dGi\n" "memory" \
+	printf "%-15s %dGi / %dGi\n" "memory" \
 		"$(( memory_used  / 1024 / 1024 ))" \
 		"$(( memory_total / 1024 / 1024 ))"
+	printf "%-15s %dGb / %dGb\n" "storage" \
+		"$(( storage_used  / 1024 / 1024 ))" \
+		"$(( storage_total / 1024 / 1024 ))"
 	printf "%-15s %s %s %s\n" "load" \
 		"$load_1" \
 		"$load_5" \
 		"$load_15"
+	printf "%-15s %dd %02dh %02dm %02ds\n" "uptime" \
+		"$(( uptime / 60 / 60 / 24 ))" \
+		"$(( uptime / 60 / 60 % 24 ))" \
+		"$(( uptime / 60 % 60 ))" \
+		"$(( uptime % 60 ))"
 }