home
/
code
/
khome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a common dir layout recipe
[khome.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
a56f6e7
..
988af3a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,4
+1,5
@@
MAKEFLAGS := --no-builtin-rules
MAKEFLAGS := --no-builtin-rules
+SHELL := /bin/bash
DEPS := $(wildcard deps/*)
DEPS := $(wildcard deps/*)
@@
-21,7
+22,7
@@
endif
diff \
pull \
push \
diff \
pull \
push \
-
mpdconf_
dirs \
+ dirs \
pkgs_void \
pkgs_void_update \
pkgs_brew_cask_install \
pkgs_void \
pkgs_void_update \
pkgs_brew_cask_install \
@@
-42,13
+43,18
@@
default:
@echo '================================================================================'
@exit 1
@echo '================================================================================'
@exit 1
-home: compiled
| mpdconf_
dirs
+home: compiled dirs
cp -Rp bin $(HOME)/
$(MAKE) push
xdg-user-dirs-update
cp -Rp bin $(HOME)/
$(MAKE) push
xdg-user-dirs-update
-
mpdconf_
dirs:
+dirs:
mkdir -p ~/arc/aud
mkdir -p ~/arc/aud
+ mkdir -p ~/arc/img
+ mkdir -p ~/arc/vid
+ mkdir -p ~/dl
+ mkdir -p ~/doc
+ mkdir -p ~/proj/{pub,priv}
mkdir -p ~/var/lib/mpd/playlists
mkdir -p ~/var/log/mpd
mkdir -p ~/var/run/mpd
mkdir -p ~/var/lib/mpd/playlists
mkdir -p ~/var/log/mpd
mkdir -p ~/var/run/mpd
@@
-69,7
+75,7
@@
pkgs_void:
sudo xbps-install $(shell ./list pkgs-void.list)
pkgs_void_update:
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
#
(echo '#'; ./patch-comments pkgs-void.list.comments pkgs-void.list) | sponge pkgs-void.list
#
@@
-157,6
+163,7
@@
$(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
diff:
find home -type f -print0 \
| $(SED) -z 's/^home\///g' \
diff:
find home -type f -print0 \
| $(SED) -z 's/^home\///g' \
+ | sort -zr \
| xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
pull:
| xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
pull:
@@
-165,6
+172,10
@@
pull:
| xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%'
push:
| 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$$' \
# Limit depth because directories are copied recursively:
find home -maxdepth 1 -print0 \
| $(GREP) -zv '^home$$' \
This page took
0.042184 seconds
and
4
git commands to generate.