Tweak blocklets

1 files changed, 12 insertions, 37 deletions

diff --git a/.local/bin/blocks/memory b/.local/bin/blocks/memory
index 90eb2c6..c581a53 100755
--- a/.local/bin/blocks/memory
+++ b/.local/bin/blocks/memory
@@ -1,20 +1,7 @@
-#!/bin/sh
-# Copyright (C) 2014 Julien Bonjean <julien@bonjean.info>
+#!/bin/bash
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-TYPE="${BLOCK_INSTANCE:-mem}"
+LABEL=${LABEL:"+"}
+TYPE="${TYPE:-mem}"
 
 awk -v type=$TYPE '
 /^MemTotal:/ {
@@ -29,35 +16,23 @@ awk -v type=$TYPE '
 /^Cached:/ {
 	mem_free+=$2
 }
-/^SwapTotal:/ {
-	swap_total=$2
-}
-/^SwapFree:/ {
-	swap_free=$2
-}
 END {
-	if (type == "swap") {
-		free=swap_free/1024/1024
-		used=(swap_total-swap_free)/1024/1024
-		total=swap_total/1024/1024
-	} else {
-		free=mem_free/1024/1024
-		used=(mem_total-mem_free)/1024/1024
-		total=mem_total/1024/1024
-	}
+	free=mem_free/1024/1024
+	used=(mem_total-mem_free)/1024/1024
+	total=mem_total/1024/1024
 
 	pct=0
 	if (total > 0) {
 		pct=used/total*100
 	}
 
-	# full text
-	printf("%.1fG/%.1fG (%.f%%)\n", used, total, pct)
-
-	# short text
-	printf("%.f%%\n", pct)
+	# Full text.
+	# printf("%s %.1fG/%.1fG (%.f%%)\n", LABEL, used, total, pct)
+	printf("%s %.1fG\n", LABEL, used)
+	# Short text.
+	printf("%s %.f%%\n", LABEL, pct)
 
-	# color
+	# Color.
 	if (pct > 90) {
 		print("#FF0000")
 	} else if (pct > 80) {