Support previewing favorites

[khome.git] / Makefile

diff --git a/Makefile b/Makefile
index cfec937..01156ae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 MAKEFLAGS := --no-builtin-rules
+SHELL     := /bin/bash
 
 DEPS := $(wildcard deps/*)
 
@@ -20,7 +21,8 @@ endif
     home \
     diff \
     pull \
-    mpdconf \
+    push \
+    mpdconf_dirs \
     pkgs_void \
     pkgs_void_update \
     pkgs_brew_cask_install \
@@ -41,20 +43,16 @@ default:
        @echo '================================================================================'
        @exit 1
 
-home: mpdconf compiled
+home: compiled | mpdconf_dirs
        cp -Rp bin $(HOME)/
-       # Limit depth because directories are copied recursively:
-       find home -maxdepth 1 -print0 \
-       | $(GREP) -zv '^home$$' \
-       | xargs -0 -I% cp -Rp % ~
+       $(MAKE) push
        xdg-user-dirs-update
 
-mpdconf:
+mpdconf_dirs:
        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
@@ -72,7 +70,7 @@ 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
+       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
        (echo '#'; ./patch-comments pkgs-void.list.comments pkgs-void.list) | sponge pkgs-void.list
 
 #
@@ -160,6 +158,7 @@ $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
 diff:
        find home -type f -print0 \
        | $(SED) -z 's/^home\///g' \
+       | sort -zr \
        | xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
 
 pull:
@@ -167,6 +166,12 @@ pull:
        | $(SED) -z 's/^home\///g' \
        | xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%'
 
+push:
+       # Limit depth because directories are copied recursively:
+       find home -maxdepth 1 -print0 \
+       | $(GREP) -zv '^home$$' \
+       | xargs -0 -I% cp -Rp % ~
+
 clean:
        rm -rf ./debfiles
        cd src && make clean