Switch weather format to v2

[khome.git] / Makefile

diff --git a/Makefile b/Makefile
index 02522ba..e576ff7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,26 @@ MAKEFLAGS := --no-builtin-rules
 
 DEPS := $(wildcard deps/*)
 
+ifeq ($(shell uname),Darwin)
+       SED := gsed
+       DIFF := $(shell gls -t1 /usr/local/Cellar/diffutils/*/bin/diff | head -1)
+else
+       SED  := sed
+       DIFF := diff
+endif
+
 .PHONY: \
     default \
     clean \
     $(DEPS) \
     deps \
     home \
+    diff \
+    pull \
     mpdconf \
     pkgs_brew_cask_install \
     pkgs_brew_install \
+    pkgs_cargo \
     pkgs_deb_install \
     pkgs_deb_purge \
     pkgs_debian \
@@ -74,6 +85,13 @@ pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
 pkgs_pip:
        sudo pip3 install $(shell ./list pkgs-pip.list)
 
+#
+# Rust (cargo)
+#
+
+pkgs_cargo: list pkgs-cargo.list
+       cargo install $(shell ./list pkgs-cargo.list)
+
 #
 # Homebrew/Mac
 #
@@ -127,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