Accept a name for dl and include starter script file

[khome.git] / Makefile

diff --git a/Makefile b/Makefile
index 01156ae..7a32ec4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ endif
     diff \
     pull \
     push \
-    mpdconf_dirs \
+    dirs \
     pkgs_void \
     pkgs_void_update \
     pkgs_brew_cask_install \
@@ -43,16 +43,13 @@ default:
        @echo '================================================================================'
        @exit 1
 
-home: compiled | mpdconf_dirs
+home: compiled dirs
        cp -Rp bin $(HOME)/
        $(MAKE) push
        xdg-user-dirs-update
 
-mpdconf_dirs:
-       mkdir -p ~/arc/aud
-       mkdir -p ~/var/lib/mpd/playlists
-       mkdir -p ~/var/log/mpd
-       mkdir -p ~/var/run/mpd
+dirs:
+       mkdir -p $(shell ./list dirs)
 
 compiled:
        mkdir -p bin
@@ -69,15 +66,23 @@ font_cache:
 pkgs_void:
        sudo xbps-install $(shell ./list pkgs-void.list)
 
+# Mark $pkg as manually-installed:
+#
+#     sudo xbps-pkgdb -m manual $pkg
+#
+# List manually-installed packages:
+#
+#     xbps-query -m
+#
 pkgs_void_update:
-       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
+       xbps-query -m | awk -F - '{sub("-" $$NF "$$", ""); print}' | sort -fu | 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
 
 #
 # Golang
 #
 pkgs_golang: list pkgs-golang.list
-       go get -u $(shell ./list pkgs-golang.list)
+       go install $(shell ./list pkgs-golang.list)
 
 #
 # Ubuntu
@@ -161,12 +166,20 @@ diff:
        | sort -zr \
        | xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
 
+.PHONY: diff_bins_untracked
+diff_bins_untracked:
+       ls -1 ~/bin | sort | grep -vf <(ls -1 home/bin | sort)
+
 pull:
        find home -type f -print0 \
        | $(SED) -z 's/^home\///g' \
        | xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%'
 
 push:
+       # TODO Backup files before replacing.
+       #      But - recursive copy is not a good strategy for this.
+       #      Need to do a file by file pass, like the diff recipe.
+       #
        # Limit depth because directories are copied recursively:
        find home -maxdepth 1 -print0 \
        | $(GREP) -zv '^home$$' \