From 0373e52441bad0fcf37ad5f953ecde51886bfce0 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 15 Jan 2013 16:12:34 +0000 Subject: adv_graphgen: remove temporary data properly --- retiolum/scripts/adv_graphgen/anonytize.sh | 6 +++--- retiolum/scripts/adv_graphgen/sanitize.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'retiolum/scripts') diff --git a/retiolum/scripts/adv_graphgen/anonytize.sh b/retiolum/scripts/adv_graphgen/anonytize.sh index b31f4dbb..2e2045e4 100755 --- a/retiolum/scripts/adv_graphgen/anonytize.sh +++ b/retiolum/scripts/adv_graphgen/anonytize.sh @@ -9,8 +9,8 @@ LOG_FILE=${LOG_FILE:-/var/log/syslog} TYPE=svg TYPE2=png OPENER=/bin/true -DOTFILE=`mktemp` -trap 'rm $DOTFILE' INT TERM +DOTFILE=`mktemp --suffix=anon` +trap 'rm $DOTFILE' INT TERM KILL sudo -E python tinc_stats2json |\ python parse_tinc_anon.py> $DOTFILE @@ -24,7 +24,7 @@ do mv $tmpgraph $1/retiolum_$i.$TYPE i=`expr $i + 1` done -#convert -resize 20% $1/retiolum_1.$TYPE $1/retiolum_1.$TYPE2 +convert $1/retiolum_1.$TYPE $1/retiolum_1.$TYPE2 #convert -resize 20% $1/retiolum_2.$TYPE $1/retiolum_2.$TYPE2 #convert -resize 20% $1/retiolum_3.$TYPE $1/retiolum_3.$TYPE2 #convert -resize 20% $1/retiolum_4.$TYPE $1/retiolum_4.$TYPE2 diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 45d29a22..846cc549 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -9,8 +9,8 @@ LOG_FILE=${LOG_FILE:-/var/log/syslog} TYPE=svg TYPE2=png OPENER=/bin/true -DOTFILE=`mktemp` -trap 'rm $DOTFILE' INT TERM +DOTFILE=`mktemp --suffix=san` +trap 'rm $DOTFILE' INT TERM KILL sudo -E python tinc_stats2json |\ python parse_tinc_stats.py > $DOTFILE @@ -25,7 +25,7 @@ do i=`expr $i + 1` done -#convert -resize 20% $1/retiolum_1.$TYPE $1/retiolum_1.$TYPE2 +convert $1/retiolum_1.$TYPE $1/retiolum_1.$TYPE2 #convert -resize 20% $1/retiolum_2.$TYPE $1/retiolum_2.$TYPE2 #convert -resize 20% $1/retiolum_3.$TYPE $1/retiolum_3.$TYPE2 #convert -resize 20% $1/retiolum_4.$TYPE $1/retiolum_4.$TYPE2 -- cgit v1.2.3