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

diff --git a/Makefile b/Makefile
index b67a24f..788b7d2 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,11 @@ MAKEFLAGS := --no-builtin-rules
 DEPS := $(wildcard deps/*)
 
 ifeq ($(shell uname),Darwin)
+	GREP := ggrep
 	SED := gsed
 	DIFF := $(shell gls -t1 /usr/local/Cellar/diffutils/*/bin/diff | head -1)
 else
+	GREP := grep
 	SED  := sed
 	DIFF := diff
 endif
@@ -19,6 +21,8 @@ endif
     diff \
     pull \
     mpdconf \
+    pkgs_void \
+    pkgs_void_update \
     pkgs_brew_cask_install \
     pkgs_brew_install \
     pkgs_cargo \
@@ -41,15 +45,15 @@ home: mpdconf compiled
 	cp -Rp bin $(HOME)/
 	# Limit depth because directories are copied recursively:
 	find home -maxdepth 1 -print0 \
-	| grep -zv '^home$$' \
+	| $(GREP) -zv '^home$$' \
 	| xargs -0 -I% cp -Rp % ~
 
 mpdconf:
-	@mkdir -p ~/Archives/Audio
-	@mkdir -p ~/var/lib/mpd/playlists
-	@mkdir -p ~/var/log/mpd
-	@mkdir -p ~/var/run/mpd
-	@cp home/.mpdconf $(HOME)/
+	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
@@ -57,13 +61,24 @@ compiled:
 	mv src/clockloop bin/
 
 font_cache:
-	@fc-cache -fv
+	fc-cache -fv
+
+#
+# Void Linux
+#
+
+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
 
 #
 # Golang
 #
 pkgs_golang: list pkgs-golang.list
-	go get $(shell ./list pkgs-golang.list)
+	go get -u $(shell ./list pkgs-golang.list)
 
 #
 # Ubuntu
@@ -78,10 +93,10 @@ pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
 # PIP
 #
 pkgs_pip_install:
-	pip3 install --user $(shell ./list pkgs-pip.list)
+	pip install --user $(shell ./list pkgs-pip.list)
 
 pkgs_pip_upgrade:
-	pip3 install --user --upgrade $(shell ./list pkgs-pip.list)
+	pip install --user --upgrade $(shell ./list pkgs-pip.list)
 
 #
 # Rust (cargo)
@@ -144,7 +159,7 @@ $(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 \