[tor-commits] [flashproxy/master] Define FLASHPROXY_DIR in one place.

[dcf at torproject.org]

commit 447c6eba6e8d8e6f14bc1dcd3f38feac4e397912
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Oct 30 23:26:09 2011 -0700

    Define FLASHPROXY_DIR in one place.
---
 experiments/common.sh                           |    2 ++
 experiments/switching/local-http-alternating.sh |    2 --
 experiments/switching/local-http-constant.sh    |    2 --
 experiments/switching/remote-tor-alternating.sh |    2 --
 experiments/switching/remote-tor-constant.sh    |    2 --
 experiments/throughput/throughput.sh            |    2 --
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/experiments/common.sh b/experiments/common.sh
index 7e5d0a4..632a99b 100644
--- a/experiments/common.sh
+++ b/experiments/common.sh
@@ -1,6 +1,8 @@
 # This file contains common variables and subroutines used by the experiment
 # scripts.
 
+FLASHPROXY_DIR="$(dirname $BASH_SOURCE)/.."
+
 FIREFOX=firefox
 SOCAT=socat
 THTTPD=thttpd
diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh
index cae696c..2e8144b 100755
--- a/experiments/switching/local-http-alternating.sh
+++ b/experiments/switching/local-http-alternating.sh
@@ -6,8 +6,6 @@
 
 . ../common.sh
 
-FLASHPROXY_DIR=../../../flashproxy
-
 PROFILE_1=flashexp1
 PROFILE_2=flashexp2
 PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002"
diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh
index 1632d62..05f6b4e 100755
--- a/experiments/switching/local-http-constant.sh
+++ b/experiments/switching/local-http-constant.sh
@@ -6,8 +6,6 @@
 
 . ../common.sh
 
-FLASHPROXY_DIR=../../../flashproxy
-
 PROFILE_1=flashexp1
 PROFILE_2=flashexp2
 PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002"
diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh
index b665bc2..6fca22b 100755
--- a/experiments/switching/remote-tor-alternating.sh
+++ b/experiments/switching/remote-tor-alternating.sh
@@ -6,8 +6,6 @@
 
 . ../common.sh
 
-FLASHPROXY_DIR=../../../flashproxy
-
 PROFILE_1=flashexp1
 PROFILE_2=flashexp2
 PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002"
diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh
index 76bca81..02b550c 100755
--- a/experiments/switching/remote-tor-constant.sh
+++ b/experiments/switching/remote-tor-constant.sh
@@ -6,8 +6,6 @@
 
 . ../common.sh
 
-FLASHPROXY_DIR=../../../flashproxy
-
 PROFILE_1=flashexp1
 PROFILE_2=flashexp2
 PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002"
diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh
index 944bcc1..b814fc7 100755
--- a/experiments/throughput/throughput.sh
+++ b/experiments/throughput/throughput.sh
@@ -10,8 +10,6 @@
 
 . ../common.sh
 
-FLASHPROXY_DIR=../../../flashproxy
-
 NUM_CLIENTS=1
 
 while getopts "n:" OPTNAME; do