[tor-commits] [ooni-probe/master] Attempt to fix https://trac.torproject.org/projects/tor/ticket/16713

[art@xxxxxxxxxxxxxx]

commit 3e3c18367fdf018f2d919fdc89f5295332adc212
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Tue Aug 4 18:18:21 2015 +0200

    Attempt to fix https://trac.torproject.org/projects/tor/ticket/16713
---
 scripts/install.sh |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 016c072..a63c506 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -12,6 +12,7 @@ TOR_DEB_REPO="http://deb.torproject.org/torproject.org";
 CLOUDFRONT="no"
 INSTALL_PT="yes"
 PYTHONPATH=$(python -c "import sys; print ':'.join(x for x in sys.path if x)")
+PYTHON_PREFIX="/usr/local"
 
 # These are the minimum ubuntu and debian version required to use the debian
 # package.
@@ -249,7 +250,7 @@ install_pluggable_transports() {
     install_pluggable_transport_deps
     (
       set -x
-      PYTHONPATH=$PYTHONPATH $sh_c 'pip install obfsproxy fteproxy'
+      $sh_c "PYTHONPATH=$(PYTHONPATH) pip install --install-option=\"--prefix=$PYTHON_PREFIX\" obfsproxy fteproxy"
     )
     install_obfs4proxy
     install_meek
@@ -269,7 +270,7 @@ case "$lsb_dist" in
           $sh_c "${yum} -y groupinstall \"Development tools\""
           $sh_c "${yum} -y install zlib-devel bzip2-devel openssl-devel sqlite-devel libpcap-devel libffi-devel libevent-devel GeoIP-devel tor python-devel libdnet-devel gcc-c++"
           install_pip
-          PYTHONPATH=$PYTHONPATH $sh_c 'pip install ooniprobe'
+          $sh_c "PYTHONPATH=$(PYTHONPATH) pip install --install-option=\"--prefix=$PYTHON_PREFIX\" ooniprobe"
 		)
 
         install_pluggable_transports
@@ -322,7 +323,7 @@ case "$lsb_dist" in
       (
         set -x
         $sh_c 'apt-get install -y -q curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap tor tor-geoipdb libgeoip-dev libpcap0.8-dev libssl-dev libffi-dev libdumbnet-dev'
-        PYTHONPATH=$PYTHONPATH $sh_c 'pip install ooniprobe'
+        $sh_c "PYTHONPATH=$(PYTHONPATH) pip install --install-option=\"--prefix=$PYTHON_PREFIX\" ooniprobe"
       )
     fi
     



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits