X-Git-Url: https://git.xandkar.net/?p=khome.git;a=blobdiff_plain;f=Makefile;h=00513639ef8c6142852bc4fd808a88687b007384;hp=71b1ea41e1de23973fb7b517d168b75ccc0643b2;hb=8ad306948567713ad75fabaf4ab0948137d26430;hpb=7acf9b505b5d9b3e2656aa4ffca938075ff7b79d

diff --git a/Makefile b/Makefile
index 71b1ea4..0051363 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 MAKEFLAGS := --no-builtin-rules
 
-DIFF := diff --color=always
 DEPS := $(wildcard deps/*)
 
 .PHONY: \
@@ -9,6 +8,8 @@ DEPS := $(wildcard deps/*)
     $(DEPS) \
     deps \
     home \
+    diff \
+    pull \
     mpdconf \
     pkgs_brew_cask_install \
     pkgs_brew_install \
@@ -127,24 +128,14 @@ endef
 $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
 
 diff:
-	$(DIFF) $(HOME)/.Rprofile                           home/.Rprofile                           ||  true
-	$(DIFF) $(HOME)/.compton.conf                       home/.compton.conf                       ||  true
-	$(DIFF) $(HOME)/.config/dunst/dunstrc               home/.config/dunst/dunstrc               ||  true
-	$(DIFF) $(HOME)/.config/mimeapps.list               home/.config/mimeapps.list               ||  true
-	$(DIFF) $(HOME)/.config/neofetch/config.conf        home/.config/neofetch/config.conf        ||  true
-	$(DIFF) $(HOME)/.config/ranger/rc.conf              home/.config/ranger/rc.conf              ||  true
-	$(DIFF) $(HOME)/.config/screengrab/screengrab.conf  home/.config/screengrab/screengrab.conf  ||  true
-	$(DIFF) $(HOME)/.fonts.conf                         home/.fonts.conf                         ||  true
-	$(DIFF) $(HOME)/.mpdconf                            home/.mpdconf                            ||  true
-	$(DIFF) $(HOME)/.newsboat/config                    home/.newsboat/config                    ||  true
-	$(DIFF) $(HOME)/.profile                            home/.profile                            ||  true
-	$(DIFF) $(HOME)/.tmux.conf                          home/.tmux.conf                          ||  true
-	$(DIFF) $(HOME)/.xbindkeysrc                        home/.xbindkeysrc                        ||  true
-	$(DIFF) $(HOME)/lib/login_aliases.sh                home/lib/login_aliases.sh                ||  true
-	$(DIFF) $(HOME)/lib/login_functions.sh              home/lib/login_functions.sh              ||  true
-	$(DIFF) $(HOME)/lib/login_variables.sh              home/lib/login_variables.sh              ||  true
-	$(DIFF) $(HOME)/lib/login_variables_dpi_high.sh     home/lib/login_variables_dpi_high.sh     ||  true
-	$(DIFF) $(HOME)/lib/login_variables_dpi_norm.sh     home/lib/login_variables_dpi_norm.sh     ||  true
+	find home -type f -print0 \
+	| sed -z 's/^home\///g' \
+	| xargs -0 -I% sh -c 'echo %; diff --color=always ~/% home/%'
+
+pull:
+	find home -type f -print0 \
+	| sed -z 's/^home\///g' \
+	| xargs -0 -I% sh -c 'diff -q ~/% home/% > /dev/null || cp ~/% home/%'
 
 clean:
 	rm -rf ./debfiles