From 7868566a7865fd3af8c55bf9a626fa7be3a0d5ad Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 12 Dec 2015 18:18:57 +0200
Subject: [PATCH] Improve PlatformIO installation on the Mac OS X El Capitan

---
 HISTORY.rst            |  1 +
 docs/installation.rst  | 18 +++++++++---------
 platformio/__init__.py |  2 +-
 platformio/util.py     |  3 ++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index a9873a3e..387714aa 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -13,6 +13,7 @@ PlatformIO 2.0
 * Added support for Espressif ESP8266 ESP-01-1MB board (ready for OTA)
 * Handle ``upload_flags`` option in `platformio.ini <http://docs.platformio.org/en/latest/projectconf.html>`__
   (`issue #368 <https://github.com/platformio/platformio/issues/368>`_)
+* Improved PlatformIO installation on the Mac OS X El Capitan
 
 2.5.0 (2015-12-08)
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/installation.rst b/docs/installation.rst
index 0f45b4fe..d810dbae 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -52,23 +52,17 @@ Please *choose ONE of* the following methods:
 a) Python Package Manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The latest stable version of PlatformIO may be installed/upgraded via
+The latest stable version of PlatformIO may be installed or upgraded via
 `pip <https://pip.pypa.io>`_ as follows:
 
 .. code-block:: bash
 
-    # update dependent packages to the latest versions
-    pip install -U pip setuptools
-
-    # install/upgrade the latest version of PlatformIO
     pip install -U platformio
 
 Note that you may run into permissions issues running these commands. You have
 a few options here:
 
 * Run with ``sudo`` to install PlatformIO and dependencies globally
-* Specify the `pip install --user <https://pip.pypa.io/en/stable/user_guide.html#user-installs>`_
-  option to install local to your user
 * Run the command in a `virtualenv <https://virtualenv.pypa.io>`_ local to a
   specific project working set.
 
@@ -132,7 +126,6 @@ c) Full Guide
 
 .. code-block:: bash
 
-    pip install -U pip setuptools
     pip install -U platformio
 
 If your computer does not recognize ``pip`` command, try to install it first
@@ -151,13 +144,20 @@ Install the latest PlatformIO from the ``develop`` branch:
 
 .. code-block:: bash
 
-    pip install -U pip setuptools
     pip install -U https://github.com/platformio/platformio/archive/develop.zip
 
 If you want to be up-to-date with the latest ``develop`` version of PlatformIO,
 then you need to re-install PlatformIO each time if you see the new commits in
 `PlatformIO GitHub repository (branch: develop) <https://github.com/platformio/platformio/commits/develop>`_.
 
+To revert to the latest stable version
+
+.. code-block:: bash
+
+    pip uninstall platformio
+    pip install -U platformio
+
+
 Troubleshooting
 ---------------
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 3b5a5dc1..7c330bb1 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (2, 5, "1.dev0")
+VERSION = (2, 5, "1.dev1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/util.py b/platformio/util.py
index 4eefbecb..6b3a8557 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -366,7 +366,8 @@ def test_scons():
 def install_scons():
     r = exec_command(["pip", "install", "-U", "scons"])
     if r['returncode'] != 0:
-        r = exec_command(["pip", "install", "--egg", "scons"])
+        r = exec_command(["pip", "install", "--egg", "scons",
+                          '--install-option="--no-install-man"'])
     return r['returncode'] == 0