X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=7f3ef9162faf20d409a2f08692e98901e82e041b;hb=b7f9c894dbdbf584abba590d48c2f84fcb8adc8f;hp=c2d4b8c564ae2beba489e751fe88d292d6be96da;hpb=208d5ebf49ac3f0d2b0bee6340bdb3488f92e308;p=khome.git

diff --git a/Makefile b/Makefile
index c2d4b8c..7f3ef91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 MAKEFLAGS := --no-builtin-rules
+SHELL     := /bin/bash
 
 DEPS := $(wildcard deps/*)
 
@@ -20,7 +21,8 @@ endif
     home \
     diff \
     pull \
-    mpdconf \
+    push \
+    mpdconf_dirs \
     pkgs_void \
     pkgs_void_update \
     pkgs_brew_cask_install \
@@ -41,19 +43,16 @@ default:
 	@echo '================================================================================'
 	@exit 1
 
-home: mpdconf compiled
+home: compiled | mpdconf_dirs
 	cp -Rp bin $(HOME)/
-	# Limit depth because directories are copied recursively:
-	find home -maxdepth 1 -print0 \
-	| $(GREP) -zv '^home$$' \
-	| xargs -0 -I% cp -Rp % ~
+	$(MAKE) push
+	xdg-user-dirs-update
 
-mpdconf:
+mpdconf_dirs:
 	mkdir -p ~/arc/aud
 	mkdir -p ~/var/lib/mpd/playlists
 	mkdir -p ~/var/log/mpd
 	mkdir -p ~/var/run/mpd
-	cp home/.mpdconf $(HOME)/
 
 compiled:
 	mkdir -p bin
@@ -71,8 +70,8 @@ pkgs_void:
 	sudo xbps-install $(shell ./list pkgs-void.list)
 
 pkgs_void_update:
-	xbps-query -m | awk -F - '{sub("-" $$NF "$$", ""); print}' | sort -u > pkgs-void.list
-	patch pkgs-void.list pkgs-void.list.comments.patch
+	xbps-query -m | awk -F - '{sub("-" $$NF "$$", ""); print}' | sort -u | grep -vf <(./list -v sep='\n' -v end='\n' pkgs-void-src.list) > pkgs-void.list
+	(echo '#'; ./patch-comments pkgs-void.list.comments pkgs-void.list) | sponge pkgs-void.list
 
 #
 # Golang
@@ -159,13 +158,19 @@ $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
 diff:
 	find home -type f -print0 \
 	| $(SED) -z 's/^home\///g' \
-	| xargs -0 -I% sh -c 'echo %; $(DIFF) --color=always ~/% home/%'
+	| xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
 
 pull:
 	find home -type f -print0 \
 	| $(SED) -z 's/^home\///g' \
 	| xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%'
 
+push:
+	# Limit depth because directories are copied recursively:
+	find home -maxdepth 1 -print0 \
+	| $(GREP) -zv '^home$$' \
+	| xargs -0 -I% cp -Rp % ~
+
 clean:
 	rm -rf ./debfiles
 	cd src && make clean