X-Git-Url: https://git.xandkar.net/?p=khome.git;a=blobdiff_plain;f=Makefile;h=abcaefb08527cc69aadb3e5cff50ad7d25528d28;hp=48a22924fdd47e80f39b712c32b61f0acdc303b5;hb=55115ac1255c2c915eca460b0a95d8c5b385947a;hpb=ba898a096aa4c8f729ee0e25629a3778d61d1d3b

diff --git a/Makefile b/Makefile
index 48a2292..abcaefb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,16 @@ 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
+
 .PHONY: \
     default \
     clean \
@@ -9,14 +19,17 @@ DEPS := $(wildcard deps/*)
     deps \
     home \
     diff \
+    pull \
     mpdconf \
     pkgs_brew_cask_install \
     pkgs_brew_install \
+    pkgs_cargo \
     pkgs_deb_install \
     pkgs_deb_purge \
     pkgs_debian \
     pkgs_mac \
-    pkgs_pip \
+    pkgs_pip_install \
+    pkgs_pip_upgrade \
     pkgs_snap_classic \
     pkgs_snap_strict
 
@@ -27,24 +40,18 @@ default:
 	@exit 1
 
 home: mpdconf compiled
-	@cp  -Rp       bin           $(HOME)/
-	@cp  -Rp  home/bin           $(HOME)/
-	@cp  -Rp  home/lib           $(HOME)/
-	@cp       home/.compton.conf $(HOME)/
-	@cp  -Rp  home/.config/      $(HOME)/
-	@cp  -Rp  home/.newsboat/    $(HOME)/
-	@cp       home/.profile      $(HOME)/
-	@cp       home/.fonts.conf   $(HOME)/
-	@cp       home/.Rprofile     $(HOME)/
-	@cp       home/.tmux.conf    $(HOME)/
-	@cp       home/.xbindkeysrc  $(HOME)/
+	cp -Rp bin $(HOME)/
+	# Limit depth because directories are copied recursively:
+	find home -maxdepth 1 -print0 \
+	| $(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
@@ -52,13 +59,13 @@ compiled:
 	mv src/clockloop bin/
 
 font_cache:
-	@fc-cache -fv
+	fc-cache -fv
 
 #
 # Golang
 #
 pkgs_golang: list pkgs-golang.list
-	go get $(shell ./list pkgs-golang.list)
+	go get -u $(shell ./list pkgs-golang.list)
 
 #
 # Ubuntu
@@ -72,8 +79,18 @@ pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
 #
 # PIP
 #
-pkgs_pip:
-	sudo pip3 install $(shell ./list pkgs-pip.list)
+pkgs_pip_install:
+	pip3 install --user $(shell ./list pkgs-pip.list)
+
+pkgs_pip_upgrade:
+	pip3 install --user --upgrade $(shell ./list pkgs-pip.list)
+
+#
+# Rust (cargo)
+#
+
+pkgs_cargo: list pkgs-cargo.list
+	cargo install $(shell ./list pkgs-cargo.list)
 
 #
 # Homebrew/Mac
@@ -128,8 +145,13 @@ $(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/%'
+	| $(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