save point

sys.bash

@@ -17,23 +17,30 @@ function meminfo() {
     echo "Memory:"
     # We will get to this later
     #total=$(free -h| grep ) #| grep -E "Mem|Swap"
+    total=$(free -h | awk '/^Mem/ {print $2}')
+    used=$(free -h | awk '/^Mem/ {print $3}')
+    free=$(free -h | awk '/^Mem/ {print $4}')
+    echo "Total: $total, Used: $used, Free: $free"
+
 }
 
 function diskinfo() {
     echo "Disk:"
     # We will get to this later 
+    disks=$(lsblk -d -o NAME,FSTYPE,SIZE,MOUNTPOINT,LABEL | awk 'NR>1 {print $1,$2,$3,$4,$5}')
+    for disk in $disks; do
+        echo "$disk"
+    done
+
 }
 
 function networkinfo() {
     echo "Network:"
     # get network interfaces and usage
 
-    # get network adapters and usage
-    adapters=$(ip -s addr | grep -E '^[0-9]:' | awk -F ':' '{print $2}')
-    for adapter in $adapters; do
-        rx=$(ip -s link show $adapter | awk '/RX:/ {print $2}')
-        tx=$(ip -s link show $adapter | awk '/TX:/ {print $2}')
-        echo -e "$adapter\tRX: $rx\tTX: $tx"
+    net=$(ifstat -j | jq -r '.[] | "\(.interface) TX:\(.tx.kbps) RX:\(.rx.kbps)"')
+    for interface in $net; do
+        echo "$interface"
     done