diff options
| author | EUcancER <root@euer.krebsco.de> | 2011-08-26 11:48:02 +0200 |
|---|---|---|
| committer | EUcancER <root@euer.krebsco.de> | 2011-08-26 11:48:02 +0200 |
| commit | efe72ae286caa4ecf88edcbcb619fb0ceb886ca8 (patch) | |
| tree | 9a9d4bc893c5a5a4d917e2d7d28e861d54c91328 | |
| parent | 4dd8fc77939c35d9d0d88557329e9fecf312f1eb (diff) | |
adv_graphgen: add HERE variable to launch from every dir
| -rw-r--r-- | retiolum/Makefile | 7 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/sanitize.sh | 18 |
2 files changed, 14 insertions, 11 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile index 407d8c60..c80a6faa 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -8,9 +8,10 @@ links: for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done hosts: - bin/update-retiolum-hosts + bin/update-retiolum-hosts || true install: update + @#punani -Ei tinc python @# will not run automatically scripts/tinc_setup/install.sh scripts/autostart/create-startup.sh @@ -18,10 +19,10 @@ install: update update: hosts @echo creating Magic bin/update_tinc_hosts "create magic" || true - @echo adding hosts + @echo adding hosts bin/update_tinc_hosts restart arch-install: update install arch-autostart autohosts arch-autostart: - make -C scripts/autostart arch + make -C scripts/autostart arch || true diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 38281fba..df6216fa 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,17 +1,19 @@ +#!/bin/sh +HERE=$(dirname `readlink -f $0`) GRAPH_SETTER1=dot GRAPH_SETTER2=circo GRAPH_SETTER3='neato -Goverlap=prism ' GRAPH_SETTER4=sfdp -LOG_FILE=/var/log/everything.log +LOG_FILE=/var/log/syslog OPENER=/bin/true sudo pkill -USR2 tincd sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\ - ./parse.py > retiolum.dot + $HERE/parse.py > $HERE/retiolum.dot -$GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot -$GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot -$GRAPH_SETTER3 -Tpng -o $1retiolum_3.png retiolum.dot -$GRAPH_SETTER4 -Tpng -o $1retiolum_4.png retiolum.dot -$OPENER retiolum_1.png &>/dev/null -rm retiolum.dot +$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $HERE/retiolum.dot +$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $HERE/retiolum.dot +$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $HERE/retiolum.dot +$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $HERE/retiolum.dot +$OPENER $HERE/retiolum_1.png &>/dev/null +rm $HERE/retiolum.dot |