From 01906edb8873e9d8127f17fee8fba294122da287 Mon Sep 17 00:00:00 2001
From: Peter Mounce <petermounce@improbable.io>
Date: Fri, 14 Oct 2016 06:44:23 +0000
Subject: More changes for chocolatey package.

1. Update required version of msys to match versions that are published on chocolatey
2. Warn user about required possibly incompatible entries in PATH.

Closes #1933.

--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/1933
MOS_MIGRATED_REVID=136129573
---
 scripts/packages/chocolatey/bazel.nuspec.template          | 2 +-
 scripts/packages/chocolatey/chocolateyinstall.ps1.template | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'scripts/packages')

diff --git a/scripts/packages/chocolatey/bazel.nuspec.template b/scripts/packages/chocolatey/bazel.nuspec.template
index 7c81c9a9f7..8cd710c88e 100644
--- a/scripts/packages/chocolatey/bazel.nuspec.template
+++ b/scripts/packages/chocolatey/bazel.nuspec.template
@@ -76,7 +76,7 @@ Supply like `--params="/option:value ..."` ([see docs for --params](https://gith
     </dependencies>-->
     <dependencies>
       <dependency id="jdk8" version="[8.0.102,)"/>
-      <dependency id="msys2" version="[20160205,)"/>
+      <dependency id="msys2" version="[20160719.1,)"/>
       <dependency id="python2" version="[2.7.11,3.0)"/>
     </dependencies>
     <!-- chocolatey-uninstall.extension - If supporting 0.9.9.x (or below) and including a chocolateyUninstall.ps1 file to uninstall an EXE/MSI, you probably want to include chocolatey-uninstall.extension as a dependency. Please verify whether you are using a helper function from that package. -->
diff --git a/scripts/packages/chocolatey/chocolateyinstall.ps1.template b/scripts/packages/chocolatey/chocolateyinstall.ps1.template
index 4d12ed270f..beadbd4a63 100644
--- a/scripts/packages/chocolatey/chocolateyinstall.ps1.template
+++ b/scripts/packages/chocolatey/chocolateyinstall.ps1.template
@@ -58,6 +58,12 @@ ps_var_addToMsysPath = (ps_var_packageDir -replace 'c:\\','/c/') -replace '\\','
 write-host @"
 bazel installed to ps_var_packageDir
 
+To use it in powershell or cmd, you should ensure your PATH environment variable contains
+  ps_var_(ps_var_msys2Path)\usr\bin
+BEFORE both
+  c:\windows\system32 (because bash-on-windows' bash.exe will be found here, if it's installed)
+  any references to msysgit (like c:\program files (x86)\git\bin or c:\program files (x86)\git\cmd) (because git's vendored version of msys2 will interfere with the real msys2)
+
 To use it in msys2, you should add that to your msys2 PATH:
   export PATH=ps_var_(ps_var_addToMsysPath):escape_charps_var_PATH
 
-- 
cgit v1.2.3