From 8d30c8928aafbd409c3b495a2685b7d63d22343c Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 2 Sep 2019 17:09:58 +0200
Subject: [PATCH] Fix experience

---
 scripts/Makefile    | 2 +-
 scripts/orig-client | 4 ++--
 scripts/run-3       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index bdd1fbc..7654a58 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,6 +1,6 @@
 tor_bw_small:
 	./run-3 \
 		1 . \
-		orig-client 1000 1000 100, orig-client 1000 100 100, orig-client 10000 10 100, 10000 1 100 . \
+		orig-client 1000 1000 100, orig-client 1000 100 100, orig-client 10000 10 100, orig-client 10000 1 100 . \
 		orig-server, orig-server, orig-server, orig-server . \
 		tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple
diff --git a/scripts/orig-client b/scripts/orig-client
index a0d5c55..14e70bc 100755
--- a/scripts/orig-client
+++ b/scripts/orig-client
@@ -1,9 +1,9 @@
 #!/bin/bash
 mkdir -p $4/{log,shared,res}
 
-pushd $4/shared
+pushd $4/shared > /dev/null
 HS="`cat onion_services.pub | head -n1`.onion"
-popd
+popd > /dev/null
 
 measlat -h $HS -p 7500 -t tor > /dev/null 2> $4/log/client-bootstrap-stderr.log # Used to wait for connections
 measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > $4/res/orig.csv 2> $4/log/client-measlat-stderr.log
diff --git a/scripts/run-3 b/scripts/run-3
index e2cf06a..dbde9a0 100755
--- a/scripts/run-3
+++ b/scripts/run-3
@@ -11,7 +11,7 @@ WAITFOR=2280 # 38min
 OLD_IFS=$IFS; IFS="."
 read -a PARTS <<< "$@"
 IFS=$OLD_IFS
-[[ ${#PARTS[@]} == 3 ]] || die "Separate count, clients and servers experiments by starts. I expect 3 parts but got ${#PARTS[@]}"
+[[ ${#PARTS[@]} == 4 ]] || die "Separate count, clients, servers experiments and tor daemon command by dots. I expect 4 parts but got ${#PARTS[@]}"
 
 # EXTRACT DATA
 OLD_IFS=$IFS; IFS=","