From 6bc088c80ea38a9d7a4288019a0578a3105875c4 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Yadav <ashishkumar.yadav@students.iiserpune.ac.in>
Date: Mon, 8 Mar 2021 21:07:27 +0530
Subject: [PATCH] Improved handling of default blocks

---
 .gitignore                                | 1 +
 GNUmakefile                               | 5 ++++-
 {blocks => blocks.def}/battery.sh         | 0
 {blocks => blocks.def}/battery_button.sh  | 0
 {blocks => blocks.def}/calendar.sh        | 0
 {blocks => blocks.def}/cpu_temp.sh        | 0
 {blocks => blocks.def}/cpu_temp_button.sh | 0
 {blocks => blocks.def}/volume.sh          | 0
 {blocks => blocks.def}/volume_button.sh   | 0
 9 files changed, 5 insertions(+), 1 deletion(-)
 rename {blocks => blocks.def}/battery.sh (100%)
 rename {blocks => blocks.def}/battery_button.sh (100%)
 rename {blocks => blocks.def}/calendar.sh (100%)
 rename {blocks => blocks.def}/cpu_temp.sh (100%)
 rename {blocks => blocks.def}/cpu_temp_button.sh (100%)
 rename {blocks => blocks.def}/volume.sh (100%)
 rename {blocks => blocks.def}/volume_button.sh (100%)

diff --git a/.gitignore b/.gitignore
index 02e57be..dc8235c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+blocks
 config.h
 dwmblocks
 sigdwmblocks/sigdwmblocks
diff --git a/GNUmakefile b/GNUmakefile
index 868f0aa..0c13f09 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -8,9 +8,12 @@ X11LIBS = $(shell pkg-config --libs x11)
 
 all: dwmblocks sigdwmblocks/sigdwmblocks xgetrootname/xgetrootname
 
-dwmblocks: dwmblocks.c config.h block.h
+dwmblocks: dwmblocks.c blocks config.h block.h
 	${CC} -o $@ -Wno-missing-field-initializers -Wno-unused-parameter ${CFLAGS} ${X11CFLAGS} $< ${X11LIBS}
 
+blocks:
+	cp -r blocks.def $@
+
 E0BLOCKS = $(abspath blocks)
 # two level escaping of `\', one for sed and one for C
 E1BLOCKS = $(subst \,\\\\,${E0BLOCKS})
diff --git a/blocks/battery.sh b/blocks.def/battery.sh
similarity index 100%
rename from blocks/battery.sh
rename to blocks.def/battery.sh
diff --git a/blocks/battery_button.sh b/blocks.def/battery_button.sh
similarity index 100%
rename from blocks/battery_button.sh
rename to blocks.def/battery_button.sh
diff --git a/blocks/calendar.sh b/blocks.def/calendar.sh
similarity index 100%
rename from blocks/calendar.sh
rename to blocks.def/calendar.sh
diff --git a/blocks/cpu_temp.sh b/blocks.def/cpu_temp.sh
similarity index 100%
rename from blocks/cpu_temp.sh
rename to blocks.def/cpu_temp.sh
diff --git a/blocks/cpu_temp_button.sh b/blocks.def/cpu_temp_button.sh
similarity index 100%
rename from blocks/cpu_temp_button.sh
rename to blocks.def/cpu_temp_button.sh
diff --git a/blocks/volume.sh b/blocks.def/volume.sh
similarity index 100%
rename from blocks/volume.sh
rename to blocks.def/volume.sh
diff --git a/blocks/volume_button.sh b/blocks.def/volume_button.sh
similarity index 100%
rename from blocks/volume_button.sh
rename to blocks.def/volume_button.sh