diff options
| author | makefu <github@syntax-fehler.de> | 2011-12-27 15:28:18 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2011-12-27 15:28:18 +0100 |
| commit | 09d77c782e149b73a5b1cb0a8d1e67825111ae89 (patch) | |
| tree | 28f25240a402d1f02812b11141c07aea4088af5e /retiolum | |
| parent | b3c427c89a49cd8b9391d1dc4d0360dd06554c57 (diff) | |
//retiolum/Makefile: rewrite tinc-up only when upgrading
Diffstat (limited to 'retiolum')
| -rw-r--r-- | retiolum/Makefile | 19 |
1 files 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 |