diff options
| author | Jason <jason.daurus@gmail.com> | 2016-06-24 21:04:39 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-06-24 21:04:39 +0800 |
| commit | 5a1677c3879c53abcaddbbfa4894fa8a117a3143 (patch) | |
| tree | adf5c9cdd79ea5d519420e0e3328ac92e1ad9dc3 /docs/install.rst | |
| parent | f392b8e34cae2d985c500ddc26a93c8f620a6f57 (diff) | |
| parent | 21c3480429108cbbd45f5ae3de7a36d15460cdc3 (diff) | |
| download | mitmproxy-5a1677c3879c53abcaddbbfa4894fa8a117a3143.tar.gz mitmproxy-5a1677c3879c53abcaddbbfa4894fa8a117a3143.tar.bz2 mitmproxy-5a1677c3879c53abcaddbbfa4894fa8a117a3143.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy into list
Conflicts:
mitmproxy/web/static/app.js
web/src/js/app.jsx
web/src/js/connection.js
web/src/js/ducks/websocket.js
Diffstat (limited to 'docs/install.rst')
| -rw-r--r-- | docs/install.rst | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/docs/install.rst b/docs/install.rst index 566430f5..6d82f81f 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -11,8 +11,10 @@ Installation On Ubuntu Ubuntu comes with Python but we need to install pip, python-dev and several libraries. This was tested on a fully patched installation of Ubuntu 14.04. ->>> sudo apt-get install python-pip python-dev libffi-dev libssl-dev libxml2-dev libxslt1-dev libjpeg8-dev zlib1g-dev ->>> sudo pip install mitmproxy +.. code:: bash + + sudo apt-get install python-pip python-dev libffi-dev libssl-dev libxml2-dev libxslt1-dev libjpeg8-dev zlib1g-dev + sudo pip install mitmproxy # or pip install --user mitmproxy Once installation is complete you can run :ref:`mitmproxy` or :ref:`mitmdump` from a terminal. @@ -27,6 +29,20 @@ get set up to contribute to the project, install the dependencies as you would f mitmproxy installation (see :ref:`install-ubuntu`). Then see the Hacking_ section of the README on GitHub. +.. _install-fedora: + +Installation On Fedora +---------------------- + +Fedora comes with Python but we need to install pip, python-dev and several libraries. +This was tested on a fully patched installation of Fedora 23. + +.. code:: bash + + sudo dnf install -y python-pip python-devel libffi-devel openssl-devel libxml2-devel libxslt-devel libpng-devel libjpeg-devel + sudo pip install mitmproxy # or pip install --user mitmproxy + +Once installation is complete you can run :ref:`mitmproxy` or :ref:`mitmdump` from a terminal. .. _install-arch: @@ -87,7 +103,9 @@ Installation On Windows First, install the latest version of Python 2.7 from the `Python website`_. If you already have an older version of Python 2.7 installed, make sure to install pip_ -(pip is included in Python 2.7.9+ by default). +(pip is included in Python 2.7.9+ by default). If pip aborts with an error, make sure you are using the current version of pip. + +>>> python -m pip install --upgrade pip Next, add Python and the Python Scripts directory to your **PATH** variable. You can do this easily by running the following in powershell: |