Improved handling of default blocks

2021-03-08 21:07:27 +05:30 · 2021-03-08 21:07:27 +05:30 · 6bc088c80e
parent 8a53fe0d4f
commit 6bc088c80e
9 changed files with 5 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
+blocks
 config.h
 dwmblocks
 sigdwmblocks/sigdwmblocks
--- a/5
+++ b/5
@ -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})
--- a/blocks.def/battery.sh
+++ b/blocks.def/battery.sh
--- a/blocks.def/battery_button.sh
+++ b/blocks.def/battery_button.sh
--- a/blocks.def/calendar.sh
+++ b/blocks.def/calendar.sh
--- a/blocks.def/cpu_temp.sh
+++ b/blocks.def/cpu_temp.sh
--- a/blocks.def/cpu_temp_button.sh
+++ b/blocks.def/cpu_temp_button.sh
--- a/blocks.def/volume.sh
+++ b/blocks.def/volume.sh
--- a/blocks.def/volume_button.sh
+++ b/blocks.def/volume_button.sh