home
/
code
/
khome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate wallpaper management
[khome.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
b67a24f
..
01156ae
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,11
+1,14
@@
MAKEFLAGS := --no-builtin-rules
MAKEFLAGS := --no-builtin-rules
+SHELL := /bin/bash
DEPS := $(wildcard deps/*)
ifeq ($(shell uname),Darwin)
DEPS := $(wildcard deps/*)
ifeq ($(shell uname),Darwin)
+ GREP := ggrep
SED := gsed
DIFF := $(shell gls -t1 /usr/local/Cellar/diffutils/*/bin/diff | head -1)
else
SED := gsed
DIFF := $(shell gls -t1 /usr/local/Cellar/diffutils/*/bin/diff | head -1)
else
+ GREP := grep
SED := sed
DIFF := diff
endif
SED := sed
DIFF := diff
endif
@@
-18,7
+21,10
@@
endif
home \
diff \
pull \
home \
diff \
pull \
- mpdconf \
+ push \
+ mpdconf_dirs \
+ pkgs_void \
+ pkgs_void_update \
pkgs_brew_cask_install \
pkgs_brew_install \
pkgs_cargo \
pkgs_brew_cask_install \
pkgs_brew_install \
pkgs_cargo \
@@
-37,19
+43,16
@@
default:
@echo '================================================================================'
@exit 1
@echo '================================================================================'
@exit 1
-home:
mpdconf compiled
+home:
compiled | mpdconf_dirs
cp -Rp bin $(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 % ~
+ $(MAKE) push
+ xdg-user-dirs-update
-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)/
+mpdconf_dirs:
+ mkdir -p ~/arc/aud
+ mkdir -p ~/var/lib/mpd/playlists
+ mkdir -p ~/var/log/mpd
+ mkdir -p ~/var/run/mpd
compiled:
mkdir -p bin
compiled:
mkdir -p bin
@@
-57,13
+60,24
@@
compiled:
mv src/clockloop bin/
font_cache:
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 | 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
#
# Golang
#
pkgs_golang: list pkgs-golang.list
- go get $(shell ./list pkgs-golang.list)
+ go get
-u
$(shell ./list pkgs-golang.list)
#
# Ubuntu
#
# Ubuntu
@@
-78,10
+92,10
@@
pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
# PIP
#
pkgs_pip_install:
# PIP
#
pkgs_pip_install:
- pip
3
install --user $(shell ./list pkgs-pip.list)
+ pip install --user $(shell ./list pkgs-pip.list)
pkgs_pip_upgrade:
pkgs_pip_upgrade:
- pip
3
install --user --upgrade $(shell ./list pkgs-pip.list)
+ pip install --user --upgrade $(shell ./list pkgs-pip.list)
#
# Rust (cargo)
#
# Rust (cargo)
@@
-144,13
+158,20
@@
$(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' \
- | xargs -0 -I% sh -c 'echo %; $(DIFF) --color=always ~/% home/%'
+ | sort -zr \
+ | xargs -0 -I% sh -c 'echo %; $(DIFF) --color=auto ~/% home/%'
pull:
find home -type f -print0 \
| $(SED) -z 's/^home\///g' \
| xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%'
pull:
find home -type f -print0 \
| $(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
clean:
rm -rf ./debfiles
cd src && make clean
This page took
0.029234 seconds
and
4
git commands to generate.