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

diff --git a/Makefile b/Makefile
index 3349116..7a32ec4 100644
--- a/Makefile
+++ b/Makefile
@@ -49,35 +49,7 @@ home: compiled dirs
 	xdg-user-dirs-update
 
 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
+	mkdir -p $(shell ./list dirs)
 
 compiled:
 	mkdir -p bin
@@ -94,15 +66,23 @@ font_cache:
 pkgs_void:
 	sudo xbps-install $(shell ./list pkgs-void.list)
 
+# Mark $pkg as manually-installed:
+#
+#     sudo xbps-pkgdb -m manual $pkg
+#
+# List manually-installed packages:
+#
+#     xbps-query -m
+#
 pkgs_void_update:
-	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
+	xbps-query -m | awk -F - '{sub("-" $$NF "$$", ""); print}' | sort -fu | 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
 #
 pkgs_golang: list pkgs-golang.list
-	go get -u $(shell ./list pkgs-golang.list)
+	go install $(shell ./list pkgs-golang.list)
 
 #
 # Ubuntu
@@ -186,6 +166,10 @@ diff:
 	| sort -zr \
 	| xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
 
+.PHONY: diff_bins_untracked
+diff_bins_untracked:
+	ls -1 ~/bin | sort | grep -vf <(ls -1 home/bin | sort)
+
 pull:
 	find home -type f -print0 \
 	| $(SED) -z 's/^home\///g' \