From b722639f1f5d4d666370cfc4bcf9da5cc5907b3e Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sat, 23 Nov 2013 22:10:46 +0100 Subject: [PATCH] more merge fixes --- bat2nodes.py | 3 --- mkmap.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bat2nodes.py b/bat2nodes.py index e85ff29..2a2d45b 100755 --- a/bat2nodes.py +++ b/bat2nodes.py @@ -53,9 +53,6 @@ if options['aliases']: for aliases in options['aliases']: db.import_aliases(json.load(open(aliases))) -if options['gateway']: - db.mark_gateways(options['gateway']) - scriptdir = os.path.dirname(os.path.realpath(__file__)) rrd = rrd(scriptdir + "/nodedb/", options['destination_directory'] + "/nodes") diff --git a/mkmap.sh b/mkmap.sh index 207fc61..c18ec39 100755 --- a/mkmap.sh +++ b/mkmap.sh @@ -10,4 +10,4 @@ DEST=$1 "$(dirname "$0")"/ffhlwiki.py http://freifunk.metameute.de/wiki/Knoten > "$(dirname "$0")"/aliases_hl.json "$(dirname "$0")"/ffhlwiki.py http://freifunk.metameute.de/wiki/Moelln:Knoten > "$(dirname "$0")"/aliases_moelln.json -"$(dirname "$0")"/bat2nodes.py -a "$(dirname "$0")"/aliases.json -a aliases_hl.json -a aliases_moelln.json -d $DEST $GWS - +"$(dirname "$0")"/bat2nodes.py -a "$(dirname "$0")"/aliases.json -a aliases_hl.json -a aliases_moelln.json -d $DEST $GWS