mittags sprint

modules/ram

@@ -1,17 +1,52 @@
 #!/bin/bash
-[[ ${BLOCK_INSTANCE} == 'swap' ]] && TYPE="SwapFree" || TYPE="MemAvailable" 
+
+[[ "$BLOCK_BUTTON" == 1 ]] && i3-sensible-terminal -e htop
+
+case ${BLOCK_INSTANCE} in
+    swap) TYPE="swap";;
+    ram) TYPE="ram";;
+    *) TYPE="";;
+esac
+
 gawk -v type="$TYPE" '
-    $0 ~ type {
-        mfg=$2/1024^2
-	    mfm=$2/1024
-    }
+    /^MemAvailable/ {
+        rfg = $2 / 1024^2
+	    rfm = $2 / 1024
+    } 
+    /^SwapFree/ {
+        sfg = $2 / 1024^2
+	    sfm = $2 / 1024
+    } 
     END {
-        if (mfg > 2) {
-            printf("%.1f GB", mfg)
-        } else {
-            printf("%.0f MB", mfm)
+        if (type == "") {
+            mfg = rfg + sfg
+            mfm = rfm + sfm
+            if (mfg > 2) {
+                printf("%d+%d G\n", rfg, sfg)
+                printf("%d+%dG\n", rfg, sfg)
+            } else {
+                printf("%d+%d M\n", rfm, sfm)
+                printf("%d+%dM\n", rfm, sfm)
+            }
+        } else if (type == "ram") {
+            if (rfg > 2) {
+                printf("%d G\n", rfg)
+                printf("%dG\n", rfg)
+                mfg = rfg
+            } else {
+                printf("%d M\n", rfm)
+                printf("%dM\n", rfm)
+            }
+        } else if (type == "swap") {
+            if (sfg > 2) {
+                printf("%d G\n", sfg)
+                printf("%dG\n", sfg)
+                mfg = sfg
+            } else {
+                printf("%d M\n", sfm)
+                printf("%dM\n", sfm)
+            }
         }
-        print("\n")
         if (mfg > 5) {
              print("#04B431\n")
          } else if (mfg > 4) {