Use custom default dir for Mathematica notebooks

[khome.git] / Makefile

diff --git a/Makefile b/Makefile
index 0051363..563f6f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,14 @@ MAKEFLAGS := --no-builtin-rules
 
 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 \
@@ -13,11 +21,13 @@ DEPS := $(wildcard deps/*)
     mpdconf \
     pkgs_brew_cask_install \
     pkgs_brew_install \
+    pkgs_cargo \
     pkgs_deb_install \
     pkgs_deb_purge \
     pkgs_debian \
     pkgs_mac \
-    pkgs_pip \
+    pkgs_pip_install \
+    pkgs_pip_upgrade \
     pkgs_snap_classic \
     pkgs_snap_strict
 
@@ -39,6 +49,7 @@ home: mpdconf compiled
        @cp       home/.Rprofile     $(HOME)/
        @cp       home/.tmux.conf    $(HOME)/
        @cp       home/.xbindkeysrc  $(HOME)/
+       @cp  -Rp  home/.Mathematica/ $(HOME)/
 
 mpdconf:
        @mkdir -p ~/Archives/Audio
@@ -73,8 +84,18 @@ pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
 #
 # 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
@@ -129,13 +150,13 @@ $(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))
 
 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/%'
+       | $(SED) -z 's/^home\///g' \
+       | xargs -0 -I% sh -c '$(DIFF) -q ~/% home/% > /dev/null || cp ~/% home/%'
 
 clean:
        rm -rf ./debfiles