Merge branch 'bugfix/windows_install_paths' into 'master'

Fix expansion of PATH on Windows setup

Was accidentally expanding in context of setup script, not at runtime.

See merge request !624

docs/windows-setup-scratch.rst

@@ -63,3 +63,5 @@ Or with credentials::
     export http_proxy='http://user:password@http.proxy.server:PORT'
 
 Add this line to ``/etc/profile`` in the MSYS directory in order to permanently enable the proxy when using MSYS.
+
+.. _MSYS2: https://msys2.github.io/

docs/windows-setup.rst

@@ -4,11 +4,11 @@ Set up of Toolchain for Windows
 Step 1: Quick Steps
 ===================
 
-Windows doesn't have a built-in "make" environment, so as well as installing the toolchain you will need a GNU-compatible environment. We use the MSYS2_ environment to provide this. You don't need to use this environment all the time (you can use Eclipse_ or some other front-end), but it runs behind the scenes.
+Windows doesn't have a built-in "make" environment, so as well as installing the toolchain you will need a GNU-compatible environment. We use the MSYS2_ environment to provide this. You don't need to use this environment all the time (you can use :doc:`Eclipse </eclipse-setup>` or some other front-end), but it runs behind the scenes.
 
 The quick setup is to download the Windows all-in-one toolchain & MSYS zip file from dl.espressif.com:
 
-https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20170321.zip
+https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20170330.zip
 
 Unzip the zip file to ``C:\`` (or some other location, but this guide assumes ``C:\``) and it will create an "msys32" directory with a pre-prepared environment.
 
@@ -62,10 +62,8 @@ Type a command like this to set the path to ESP-IDF directory: ``export IDF_PATH
 
 Use ``cd`` to change to the project directory (not the ESP-IDF directory.) Type ``make menuconfig`` to configure your project, then ``make`` to build it, ``make clean`` to remove built files, and ``make flash`` to flash (use the menuconfig to set the serial port for flashing.)
 
-If you'd like to use the Eclipse IDE instead of running ``make``, check out the Eclipse setup guide in this directory.
+If you'd like to use the Eclipse IDE instead of running ``make``, check out the :doc:`Eclipse guide </eclipse-setup>`.
 
 
-.. _Eclipse: eclipse-setup.rst
-.. _MSYS2: https://msys2.github.io/
 .. _github: https://github.com/espressif/esp-idf-template
 .. _known issue: https://github.com/espressif/esp-idf/issues/11

tools/windows/windows_install_prerequisites.sh

@@ -51,7 +51,7 @@ rm ~/${TOOLCHAIN_ZIP}
 cat > /etc/profile.d/esp32_toolchain.sh << EOF
 # This file was created by ESP-IDF windows_install_prerequisites.sh
 # and will be overwritten if that script is run again.
-export PATH="$PATH:/opt/xtensa-esp32-elf/bin"
+export PATH="\$PATH:/opt/xtensa-esp32-elf/bin"
 EOF
 
 # clean up pacman packages to save some disk space