From 36443827ed6b50ad859ffbb93958b47109797cf9 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Wed, 15 May 2019 13:55:53 +0200
Subject: [PATCH] Fix scripts

---
 scripts/dup2-client |  5 +----
 scripts/dup2-server | 11 ++++-------
 scripts/rrhr-client |  5 +----
 scripts/rrhr-server | 11 ++++-------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/scripts/dup2-client b/scripts/dup2-client
index 9e128e5..17c066b 100755
--- a/scripts/dup2-client
+++ b/scripts/dup2-client
@@ -1,8 +1,5 @@
 #!/bin/bash
-mkdir -p $4/log
-tor -f /etc/torrc > $4/log/client-tor-stdout.log 2> $4/log/client-tor-stderr.log &
-sleep 2
-mkdir -p $4/shared
+mkdir -p $4/{log,shared}
 donar -a dup2 -c -o $4/shared/onion_services.pub -r 9000 > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log &
 sleep 2
 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections
diff --git a/scripts/dup2-server b/scripts/dup2-server
index 9fe324d..600b63b 100755
--- a/scripts/dup2-server
+++ b/scripts/dup2-server
@@ -1,10 +1,7 @@
 #!/bin/bash
-mkdir -p $1/log
-tor -f /etc/torrc > $1/log/server-tor-stdout.log 2> $1/log/server-tor-stderr.log  &
-sleep 2
-mkdir -p $1/shared
+mkdir -p $1/{log,shared}
 cd $1/shared
 pwd
-( sleep 180; dump_circuits > $1/log/server-circuits.txt ) &
-donar -a dup2 -s -e 9000 > $1/log/server-donar-stdout.log 2> $1/log/server-donar-stderr.log &
-udpecho -p 9000 > $1/log/server-udpecho-stdout.log 2> $1/log/server-udpecho-stderr.log
+( sleep 180; dump_circuits > ../log/server-circuits.txt ) &
+donar -a dup2 -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
+udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log
diff --git a/scripts/rrhr-client b/scripts/rrhr-client
index e7d2661..47d1d4d 100755
--- a/scripts/rrhr-client
+++ b/scripts/rrhr-client
@@ -1,8 +1,5 @@
 #!/bin/bash
-mkdir -p $4/log
-tor -f /etc/torrc > $4/log/client-tor-stdout.log 2> $4/log/client-tor-stderr.log &
-sleep 2
-mkdir -p $4/shared
+mkdir -p $4/{log,shared}
 donar -a rr -b -h -l 8 -d 1,1 -c -o $4/shared/onion_services.pub -r 9000 > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log &
 sleep 2
 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections
diff --git a/scripts/rrhr-server b/scripts/rrhr-server
index 1cd24ef..4f6e82b 100755
--- a/scripts/rrhr-server
+++ b/scripts/rrhr-server
@@ -1,10 +1,7 @@
 #!/bin/bash
-mkdir -p $1/log
-tor -f /etc/torrc > $1/log/server-tor-stdout.log 2> $1/log/server-tor-stderr.log  &
-sleep 2
-mkdir -p $1/shared
+mkdir -p $1/{log,shared}
 cd $1/shared
 pwd
-( sleep 180; dump_circuits > $1/log/server-circuits.txt ) &
-donar -a rr -l 8 -b -h -d 1,1 -s -e 9000 > $1/log/server-donar-stdout.log 2> $1/log/server-donar-stderr.log &
-udpecho -p 9000 > $1/log/server-udpecho-stdout.log 2> $1/log/server-udpecho-stderr.log
+( sleep 180; dump_circuits > ../log/server-circuits.txt ) &
+donar -a rr -l 8 -b -h -d 1,1 -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
+udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log