Switch weather format to v2

[khome.git] / Makefile

diff --git a/Makefile b/Makefile
index ca39916..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
 #
@@ -126,24 +144,14 @@ endef
 $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
 
 diff:
-       diff  $(HOME)/.Rprofile                           home/.Rprofile                           ||  true
-       diff  $(HOME)/.compton.conf                       home/.compton.conf                       ||  true
-       diff  $(HOME)/.config/dunst/dunstrc               home/.config/dunst/dunstrc               ||  true
-       diff  $(HOME)/.config/mimeapps.list               home/.config/mimeapps.list               ||  true
-       diff  $(HOME)/.config/neofetch/config.conf        home/.config/neofetch/config.conf        ||  true
-       diff  $(HOME)/.config/ranger/rc.conf              home/.config/ranger/rc.conf              ||  true
-       diff  $(HOME)/.config/screengrab/screengrab.conf  home/.config/screengrab/screengrab.conf  ||  true
-       diff  $(HOME)/.fonts.conf                         home/.fonts.conf                         ||  true
-       diff  $(HOME)/.mpdconf                            home/.mpdconf                            ||  true
-       diff  $(HOME)/.newsboat/config                    home/.newsboat/config                    ||  true
-       diff  $(HOME)/.profile                            home/.profile                            ||  true
-       diff  $(HOME)/.tmux.conf                          home/.tmux.conf                          ||  true
-       diff  $(HOME)/.xbindkeysrc                        home/.xbindkeysrc                        ||  true
-       diff  $(HOME)/lib/login_aliases.sh                home/lib/login_aliases.sh                ||  true
-       diff  $(HOME)/lib/login_functions.sh              home/lib/login_functions.sh              ||  true
-       diff  $(HOME)/lib/login_variables.sh              home/lib/login_variables.sh              ||  true
-       diff  $(HOME)/lib/login_variables_dpi_high.sh     home/lib/login_variables_dpi_high.sh     ||  true
-       diff  $(HOME)/lib/login_variables_dpi_norm.sh     home/lib/login_variables_dpi_norm.sh     ||  true
+       find home -type f -print0 \
+       | $(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