From 15201886b97ee607bb494d85eea8e3a7096c6a14 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 4 Oct 2015 22:27:46 +0200
Subject: minor fixes for tinc_graphs

---
 retiolum/scripts/adv_graphgen/MANIFEST.in            | 1 +
 retiolum/scripts/adv_graphgen/Makefile               | 4 ----
 retiolum/scripts/adv_graphgen/scripts/all-the-graphs | 2 +-
 retiolum/scripts/adv_graphgen/scripts/build-graphs   | 2 +-
 retiolum/scripts/adv_graphgen/setup.py               | 3 ++-
 5 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 retiolum/scripts/adv_graphgen/MANIFEST.in
 delete mode 100644 retiolum/scripts/adv_graphgen/Makefile

diff --git a/retiolum/scripts/adv_graphgen/MANIFEST.in b/retiolum/scripts/adv_graphgen/MANIFEST.in
new file mode 100644
index 00000000..bb3ec5f0
--- /dev/null
+++ b/retiolum/scripts/adv_graphgen/MANIFEST.in
@@ -0,0 +1 @@
+include README.md
diff --git a/retiolum/scripts/adv_graphgen/Makefile b/retiolum/scripts/adv_graphgen/Makefile
deleted file mode 100644
index fafac84e..00000000
--- a/retiolum/scripts/adv_graphgen/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-install:
-	#punani install graphviz
-	echo "add this line to your tinc.conf if you dare:"
-	echo 'GraphDumpFile = |/krebs/retiolum/scripts/adv_graphgen /srv/http/tmp/graphs/'
diff --git a/retiolum/scripts/adv_graphgen/scripts/all-the-graphs b/retiolum/scripts/adv_graphgen/scripts/all-the-graphs
index 889a9fe0..bfd71dcf 100755
--- a/retiolum/scripts/adv_graphgen/scripts/all-the-graphs
+++ b/retiolum/scripts/adv_graphgen/scripts/all-the-graphs
@@ -6,7 +6,7 @@ export GEODB="${GEODB:-}"
 export TINC_HOSTPATH=${TINC_HOSTPATH:-~/painload/retiolum/hosts}
 mapfile="$INTERNAL_FOLDER/map.html"
 
-if test -n "$GEOCITYDB";then
+if test -n "$GEODB";then
     if test ! -e "$mapfile";then
       echo "copying map to $map.html"
       copy-map "$mapfile"
diff --git a/retiolum/scripts/adv_graphgen/scripts/build-graphs b/retiolum/scripts/adv_graphgen/scripts/build-graphs
index 89151671..2adc450d 100755
--- a/retiolum/scripts/adv_graphgen/scripts/build-graphs
+++ b/retiolum/scripts/adv_graphgen/scripts/build-graphs
@@ -8,7 +8,7 @@ TYPE=svg
 TYPE2=png
 
 DOTFILE=`mktemp`
-trap 'rm "$DOTFILE"' INT TERM KILL EXIT
+trap 'rm -f "$DOTFILE"' INT TERM KILL EXIT
 
 tinc-stats2json | tinc-build-graph  "$mode" > "$DOTFILE"
 
diff --git a/retiolum/scripts/adv_graphgen/setup.py b/retiolum/scripts/adv_graphgen/setup.py
index a692ebef..5a9dcdfe 100644
--- a/retiolum/scripts/adv_graphgen/setup.py
+++ b/retiolum/scripts/adv_graphgen/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='tinc_graphs',
-    version='0.2.4',
+    version='0.2.12',
 
     description='Create Graphs from tinc Stats',
     long_description=open("README.md").read(),
@@ -17,6 +17,7 @@ setup(
     install_requires = [ 'pygeoip' ],
     scripts = ['scripts/all-the-graphs', 'scripts/build-graphs'],
     packages=['tinc_graphs'],
+    package_data = {'tinc_graphs' : ['static/*'] },
     entry_points={
         'console_scripts' : [
             'tinc-stats2json = tinc_graphs.Log2JSON:main',
-- 
cgit v1.2.3