[tor-commits] [torflow/master] Load config from local.cfg file if it exists

[aagbsn at torproject.org]

commit 6c852c8ec92a3343f5a82bfe8db4abd444f1f459
Author: Peter Palfrader <peter at palfrader.org>
Date:   Fri Jul 13 13:37:07 2012 +0200

    Load config from local.cfg file if it exists
---
 NetworkScanners/BwAuthority/.gitignore  |    1 +
 NetworkScanners/BwAuthority/run_scan.sh |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/NetworkScanners/BwAuthority/.gitignore b/NetworkScanners/BwAuthority/.gitignore
new file mode 100644
index 0000000..a0ea384
--- /dev/null
+++ b/NetworkScanners/BwAuthority/.gitignore
@@ -0,0 +1 @@
+local.cfg
diff --git a/NetworkScanners/BwAuthority/run_scan.sh b/NetworkScanners/BwAuthority/run_scan.sh
index 5b1b0ed..c9fa4c4 100755
--- a/NetworkScanners/BwAuthority/run_scan.sh
+++ b/NetworkScanners/BwAuthority/run_scan.sh
@@ -8,6 +8,8 @@ SCANNER_COUNT=4
 TOR_EXE=../../../tor.git/src/or/tor
 PYTHONPATH=../../../SQLAlchemy-0.7.3/lib:../../../Elixir-0.7.1/
 
+! [ -e local.cfg ] || . local.cfg
+
 for n in `seq $SCANNER_COUNT`; do
     PIDFILE=./data/scanner.${n}/bwauthority.pid
     if [ -f $PIDFILE ]; then