[tor-commits] [ooni-probe/develop] Run setup.py script as root

[isis at torproject.org]

commit b3812e2748ea1c9553ac2400c12d9ec967ebbaf0
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Jun 13 14:55:27 2013 +0200

    Run setup.py script as root
    Install the stable pip, before upgrading
---
 Vagrantfile |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 52107e8..10ec592 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -113,14 +113,6 @@ end
 $script = <<SCRIPT
 apt-get -y install curl python-setuptools python-dev
 
-echo "Updating to the latest version of PIP"
-cd /tmp/
-
-curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
-python ./get-pip.py  ## pip (>=1.3.0) is recommended for security reasons
-
-sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0
-
 echo "Installing Tor..."
 
 echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/source.list
@@ -133,6 +125,14 @@ apt-get -y install deb.torproject.org-keyring tor tor-geoipdb
 
 apt-get -y install git-core python python-pip python-dev build-essential libdumbnet1 python-dumbnet python-libpcap python-pypcap python-dnspython python-virtualenv virtualenvwrapper tor tor-geoipdb libpcap-dev
 
+echo "Updating to the latest version of PIP"
+cd /tmp/
+
+curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+python ./get-pip.py  ## pip (>=1.3.0) is recommended for security reasons
+
+sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0
+
 cd /data/ooniprobe
 
 echo "Installing dependencies"
@@ -140,7 +140,7 @@ pip install pyrex
 pip install -r requirements.txt
 
 echo "Installing ooniprobe"
-python setup.py install
+sudo python setup.py install
 
 echo "Fetching all inputs"
 cd /data/ooniprobe/inputs