home
/
code
/
khome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing .Mathematica dir from home install
[khome.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
02522ba
..
563f6f4
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,20
+2,32
@@
MAKEFLAGS := --no-builtin-rules
DEPS := $(wildcard deps/*)
DEPS := $(wildcard deps/*)
+ifeq ($(shell uname),Darwin)
+ SED := gsed
+ DIFF := $(shell gls -t1 /usr/local/Cellar/diffutils/*/bin/diff | head -1)
+else
+ SED := sed
+ DIFF := diff
+endif
+
.PHONY: \
default \
clean \
$(DEPS) \
deps \
home \
.PHONY: \
default \
clean \
$(DEPS) \
deps \
home \
+ diff \
+ pull \
mpdconf \
pkgs_brew_cask_install \
pkgs_brew_install \
mpdconf \
pkgs_brew_cask_install \
pkgs_brew_install \
+ pkgs_cargo \
pkgs_deb_install \
pkgs_deb_purge \
pkgs_debian \
pkgs_mac \
pkgs_deb_install \
pkgs_deb_purge \
pkgs_debian \
pkgs_mac \
- pkgs_pip \
+ pkgs_pip_install \
+ pkgs_pip_upgrade \
pkgs_snap_classic \
pkgs_snap_strict
pkgs_snap_classic \
pkgs_snap_strict
@@
-37,6
+49,7
@@
home: mpdconf compiled
@cp home/.Rprofile $(HOME)/
@cp home/.tmux.conf $(HOME)/
@cp home/.xbindkeysrc $(HOME)/
@cp home/.Rprofile $(HOME)/
@cp home/.tmux.conf $(HOME)/
@cp home/.xbindkeysrc $(HOME)/
+ @cp -Rp home/.Mathematica/ $(HOME)/
mpdconf:
@mkdir -p ~/Archives/Audio
mpdconf:
@mkdir -p ~/Archives/Audio
@@
-71,8
+84,18
@@
pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
#
# PIP
#
#
# PIP
#
-pkgs_pip:
- sudo pip3 install $(shell ./list pkgs-pip.list)
+pkgs_pip_install:
+ pip3 install --user $(shell ./list pkgs-pip.list)
+
+pkgs_pip_upgrade:
+ pip3 install --user --upgrade $(shell ./list pkgs-pip.list)
+
+#
+# Rust (cargo)
+#
+
+pkgs_cargo: list pkgs-cargo.list
+ cargo install $(shell ./list pkgs-cargo.list)
#
# Homebrew/Mac
#
# Homebrew/Mac
@@
-127,8
+150,13
@@
$(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
diff:
find home -type f -print0 \
diff:
find home -type f -print0 \
- | sed -z 's/^home\///g' \
- | xargs -0 -I% sh -c 'echo %; diff --color=always ~/% home/%'
+ | $(SED) -z 's/^home\///g' \
+ | xargs -0 -I% sh -c 'echo %; $(DIFF) --color=always ~/% home/%'
+
+pull:
+ find home -type f -print0 \
+ | $(SED) -z 's/^home\///g' \
+ | xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%'
clean:
rm -rf ./debfiles
clean:
rm -rf ./debfiles
This page took
0.024263 seconds
and
4
git commands to generate.