diff --git a/.bashrc b/.bashrc index f2c35ce66f94edbee21437d0897e13415dbf6430..1573d45a1c3bfa7b3fe5a9f39c200c56f81c29e0 100644 --- a/.bashrc +++ b/.bashrc @@ -155,7 +155,6 @@ alias occ='docker --host=ssh://host01.shore.co.il exec -itu www-data nextcloud-n alias pip2='python2 -m pip' alias pip3='python3 -m pip' alias pre-commit-update-skel='pre-commit autoupdate --config ~/.config/git/skel/.pre-commit-config.yaml' -alias presentation='docker dev registry.shore.co.il/presentation' # shellcheck disable=SC2139 alias rc_make="make --directory $HOME --always-make" alias rc_update="rc_make vendored generated" diff --git a/Makefile b/Makefile index e59b27745caf34c589f31f1f66105159ee34b981..d676cb88c1f6fc2338c182d0ad0de4fe79495adb 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,12 @@ download = $(curl) --output $@ mkd = mkdir -p $$(dirname $@) .PHONY: all +all: secure-templates all: ssh-keys +all: vendored + +.PHONY: secure-templates +.PHONY: vendored .PHONY: ssh-keys ssh-keys: .ssh/gitlab_ed25519 @@ -42,11 +47,29 @@ ssh-keys: .ssh/schoolinks_vpn_rsa ph show --field Notes "SSH/$$(basename '$@')" > '$@' chmod 600 '$@' -all: .config/pythonrc.py +vendored: .config/pythonrc.py .config/pythonrc.py: Makefile $(mkd) $(download) https://raw.githubusercontent.com/lonetwin/pythonrc/master/pythonrc_pre38.py +vendored: .local/bin/presentation +.local/bin/presentation: Makefile + $(mkd) + $(download) https://git.shore.co.il/nimrod/presentation/-/raw/master/presentation + chmod +x '$@' + +all: .local/bin/gm +.local/bin/gm: .local/bin/presentation + ln -s presentation '$@' + +all: .local/bin/pandoc +.local/bin/pandoc: .local/bin/presentation + ln -s presentation '$@' + +all: .local/bin/qpdf +.local/bin/qpdf: .local/bin/presentation + ln -s presentation '$@' + all: .ssh/config .ssh/config: $(ssh_configs) $(mkd) @@ -68,8 +91,6 @@ all: .ssh/authorized_keys $(mkd) -$(ansible-local) -m authorized_key -a "user=$$(whoami) key='$$(cat .ssh/localhost.pub)' key_options='from=\"127.0.0.1/8\"'" -.PHONY: secure-templates -all: secure-templates templates != git ls-files -- '*.j2' | sed 's/\.j2$$//' secure-templates: ${templates} %: %.j2 Documents/Database.kdbx