[tor-commits] [ooni-probe/master] Fix planet lab install script.

[art at torproject.org]

commit 5d0d9702cf78d20d3846b7b3c4843dcad1269759
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Mar 10 14:00:15 2014 +0100

    Fix planet lab install script.
---
 scripts/install_on_planetlab.sh |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh
index 88f0ae2..4b85896 100644
--- a/scripts/install_on_planetlab.sh
+++ b/scripts/install_on_planetlab.sh
@@ -3,7 +3,7 @@
 ## called torrc with inside the details of the torrc to use.
 
 sudo yum -y groupinstall "Development tools"
-sudo yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel libffi-devel screen libeven-devel unzip
+sudo yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel db4-devel libpcap-devel libffi-devel screen libeven-devel unzip tor
 cd `mktemp -d`
 
 # Install Python 2.7.6
@@ -92,8 +92,7 @@ sudo pip install obfsproxy
 ooniprobe
 
 # Update the Tor running in ooniprobe
-cat ~/.ooni/ooniprobe.conf | sed s/'start_tor: true'/'start_tor: false'/ | sed s/'#socks_port: 8801'/'socks_port: 9050'/ > ~/.ooni/ooniprobe.conf.new
-mv ~/.ooni/ooniprobe.conf.new ~/.ooni/ooniprobe.conf
+cat /usr/share/ooni/ooniprobe.conf.sample | sed s/'start_tor: true'/'start_tor: false'/ | sed s/'#socks_port: 8801'/'socks_port: 9050'/ > ~/.ooni/ooniprobe.conf
 
 mkdir /home/$USER/bridge_reachability/