X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=33491167f4e36be6cbe33c0bb4dae1a88cd1b400;hb=13c9fce8818fa242bf8354f63312ef1a6826a880;hp=7f3ef9162faf20d409a2f08692e98901e82e041b;hpb=2a8bb767ed0afdb631b7bf30afb235c1120116c6;p=khome.git

diff --git a/Makefile b/Makefile
index 7f3ef91..3349116 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ endif
     diff \
     pull \
     push \
-    mpdconf_dirs \
+    dirs \
     pkgs_void \
     pkgs_void_update \
     pkgs_brew_cask_install \
@@ -43,16 +43,41 @@ default:
 	@echo '================================================================================'
 	@exit 1
 
-home: compiled | mpdconf_dirs
+home: compiled dirs
 	cp -Rp bin $(HOME)/
 	$(MAKE) push
 	xdg-user-dirs-update
 
-mpdconf_dirs:
+dirs:
 	mkdir -p ~/arc/aud
+	mkdir -p ~/arc/backup
+	mkdir -p ~/arc/doc
+	mkdir -p ~/arc/img
+	mkdir -p ~/arc/log
+	mkdir -p ~/arc/misc
+	mkdir -p ~/arc/sw/bin
+	mkdir -p ~/arc/sw/src/misc
+	mkdir -p ~/arc/sw/src/pkgs
+	mkdir -p ~/arc/sw/src/repos
+	mkdir -p ~/arc/sw/src/tarballs
+	mkdir -p ~/arc/vid
+	mkdir -p ~/arc/work
+	mkdir -p ~/bin
+	mkdir -p ~/dl
+	mkdir -p ~/doc
+	mkdir -p ~/ex
+	mkdir -p ~/fork
+	mkdir -p ~/lib
+	mkdir -p ~/org
+	mkdir -p ~/proj/priv
+	mkdir -p ~/proj/pub
+	mkdir -p ~/snips
+	mkdir -p ~/tmp
 	mkdir -p ~/var/lib/mpd/playlists
 	mkdir -p ~/var/log/mpd
 	mkdir -p ~/var/run/mpd
+	mkdir -p ~/work
+	mkdir -p ~/x
 
 compiled:
 	mkdir -p bin
@@ -158,6 +183,7 @@ $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
 diff:
 	find home -type f -print0 \
 	| $(SED) -z 's/^home\///g' \
+	| sort -zr \
 	| xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
 
 pull:
@@ -166,6 +192,10 @@ pull:
 	| xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%'
 
 push:
+	# TODO Backup files before replacing.
+	#      But - recursive copy is not a good strategy for this.
+	#      Need to do a file by file pass, like the diff recipe.
+	#
 	# Limit depth because directories are copied recursively:
 	find home -maxdepth 1 -print0 \
 	| $(GREP) -zv '^home$$' \