From 09d77c782e149b73a5b1cb0a8d1e67825111ae89 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Dec 2011 15:28:18 +0100 Subject: //retiolum/Makefile: rewrite tinc-up only when upgrading --- retiolum/Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/retiolum/Makefile b/retiolum/Makefile index e0268c35..c77546df 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -7,26 +7,23 @@ all: update links links: for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done -hosts: - bin/update-retiolum-hosts || true -install: update +install: upgrade ../punani/bin/punani -Eih tinc /usr/bin/python /usr/bin/python2 scripts/tinc_setup/install.sh cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up scripts/autostart/create-startup.sh -update: hosts - bin/update_tinc_hosts "create magic" || true - bin/update_tinc_hosts restart +upgrade: update if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \ sudo bin/restart-tincd; \ - else \ - sudo pkill -HUP tincd || :; \ fi -arch-install: update install arch-autostart autohosts +update: hosts + bin/update_tinc_hosts "create magic" || true + bin/update_tinc_hosts restart + sudo pkill -HUP tincd || :; -arch-autostart: - make -C scripts/autostart arch || true +hosts: + bin/update-retiolum-hosts || true -- cgit v1.2.3 From f4b8bb2907e346f50e129ee35066cc41ce1ce157 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Dec 2011 16:20:32 +0100 Subject: //retiolum/Makefile: update punani --- retiolum/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/Makefile b/retiolum/Makefile index c77546df..cd0a543c 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -9,7 +9,7 @@ links: install: upgrade - ../punani/bin/punani -Eih tinc /usr/bin/python /usr/bin/python2 + ../punani/bin/punani tinc python scripts/tinc_setup/install.sh cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up scripts/autostart/create-startup.sh -- cgit v1.2.3