Update Void pkgs

[khome.git] / Makefile

diff --git a/Makefile b/Makefile
index d204943..c2d4b8c 100644 (file)
--- 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 \
@@ -38,24 +42,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
@@ -63,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
@@ -84,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)