X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=a56f6e7640b751dd714e2ce6f0c6e18c1e66d229;hb=a97a6e0971b900d8068bb07ca52841157c0ab378;hp=788b7d2160423e36c7c87bf854b99c41e9683a44;hpb=b48e809ec8919195468091c7dba43cc1d22b0c8e;p=khome.git

diff --git a/Makefile b/Makefile
index 788b7d2..a56f6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,8 @@ endif
     home \
     diff \
     pull \
-    mpdconf \
+    push \
+    mpdconf_dirs \
     pkgs_void \
     pkgs_void_update \
     pkgs_brew_cask_install \
@@ -41,19 +42,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
@@ -72,7 +70,7 @@ pkgs_void:
 
 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
+	(echo '#'; ./patch-comments pkgs-void.list.comments pkgs-void.list) | sponge pkgs-void.list
 
 #
 # Golang
@@ -166,6 +164,12 @@ pull:
 	| $(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