merged with [msys2]

userzimmermann · Sep 27, 2015 · 12cda3c · 12cda3c
2 parents 8fb155a + d047a8e
commit 12cda3c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/msys2/CHANGES.md b/msys2/CHANGES.md
@@ -1,3 +1,8 @@
+### 20150916.0.0
+
+* Changed versioning scheme.
+* Downloads 32bit or 64bit MSYS2 20150916.
+
 ### 1.1.0.20150512
 
 * Extra **msys\bash.bat** and **msys\pacman.bat** wrappers for **MSYS** mode.

diff --git a/msys2/README.md b/msys2/README.md
@@ -5,14 +5,16 @@ MSYS2 is an independent rewrite of MSYS, based on modern Cygwin (POSIX compatibi
 
 You should read the full [official introduction](http://sourceforge.net/p/msys2/wiki/MSYS2%20introduction/) before using MSYS2.
 
+Chocolatey MSYS2 combines MSYS2 with some extra tools for better integration into CMD shell (and PowerShell in future releases).
+
 ### NOTES
 
-Chocolatey MSYS2 has its own versioning scheme. The first three numbers are the Chocolatey package version and the last number ist the MSYS2 archive version that will be downloaded.
+The Chocolatey MSYS2 versioning scheme uses the current MSYS2 archive version as first component and tracks further changes in the Chocolatey package with the second and third component.
 
 Chocolatey MSYS2 automatically installs either 32bit or 64bit MSYS2. It does NOT work with `choco install -x86` (forced 32bit installation) under 64bit Windows. There is usually no need to install a 32bit MSYS2 under 64bit Windows, because MSYS2 always contains a MINGW32 and a MINGW64 environment.
 
-The MSYS2 archive will be extracted to Chocolatey's **BinRoot** (usually **C:\\Tools\\**). The 32bit variant uses an **msys32\\** root folder and the 64bit variant uses **msys64\\** respectively. The MSYS2 root folder will be appended to `%PATH%`. It contains the **msys2_shell.bat**, **mingw32_shell.bat**, and **mingw64_shell.bat** scripts. No **bin\\** folders will be added to `%PATH%`. After unpacking, MSYS2 will be automatically initialized and updated with Pacman according to the [official instructions](https://msys2.github.io).
+The MSYS2 archive will be extracted to Chocolatey's **BinRoot** (usually **C:\\Tools\\**). The 32bit variant uses an **msys32\\** root folder and the 64bit variant uses **msys64\\** respectively. The MSYS2 root folder will be appended to `%PATH%`. It contains the **msys2\_shell.bat**, **mingw32\_shell.bat**, and **mingw64\_shell.bat** scripts. No **bin\\** folders will be added to `%PATH%`. After unpacking, MSYS2 will be automatically initialized and updated with Pacman according to the [official instructions](https://msys2.github.io).
 
 MSYS2 itself will not be removed on uninstalling the Chocolatey package and will not be downloaded and extracted again (even if the MSYS2 archive version has changed) on updating or reinstalling the Chocolatey package. The existing MSYS2 will just be updated with Pacman.
 
-Chocolatey MSYS2 offers an extra **msystem.bat** script in its package folder (which will also be appended to `%PATH%`). The script can be used to activate and switch **MSYS**, **MINGW32**, and **MINGW64** environments inside a CMD shell without running Bash. It will prepend the appropriate **bin\\** folders to `%PATH%`. Call `msystem /?` after installation or look at the top of the script file for details. More extra features (like better integration with other shell environments and wrapper scripts for `bash`, `pacman`, and `makepkg`) and an according PowerShell module will be added in future releases of Chocolatey MSYS2.
+Chocolatey MSYS2 offers an extra **msystem.bat** script in its package folder (which will also be appended to `%PATH%`). The script can be used to activate and switch **MSYS**, **MINGW32**, and **MINGW64** environments inside a CMD shell without running Bash. It will prepend the appropriate **bin\\** folders to `%PATH%`. **MSYS** mode additionally provides **bash.bat** and **pacman.bat** wrapper scripts and according auto-completion scripts for Clink. Call `msystem /?` after installation or look at the top of the script file for more details. These extra features and even more (like better integration with other shell environments, a better **bash.bat**, and more wrapper scripts for tools like `makepkg`, ..., and an according PowerShell module) will be moved from the Chocolatey MSYS2 package to separate projects, which will then be installable as MSYS2 packages, of course auto-installed by Chocolatey MSYS2 :)
diff --git a/msys2/msys2.nuspec b/msys2/msys2.nuspec
@@ -4,7 +4,7 @@
   <metadata>
     <id>msys2</id>
     <title>MSYS2</title>
-    <version>1.1.0.20150512</version>
+    <version>20150916.0.0</version>
     <authors>Alexpux, martell, mingwandroid, niXman</authors>
     <owners>userzimmermann</owners>
     <summary>A Cygwin-derived software distro for Windows using Arch Linux's Pacman</summary>
@@ -17,18 +17,18 @@ Chocolatey MSYS2 combines MSYS2 with some extra tools for better integration int
 
 ### NOTES
 
-Chocolatey MSYS2 has its own versioning scheme. The first three numbers are the Chocolatey package version and the last number ist the MSYS2 archive version that will be downloaded.
+The Chocolatey MSYS2 versioning scheme uses the current MSYS2 archive version as first component and tracks further changes in the Chocolatey package with the second and third component.
 
 Chocolatey MSYS2 automatically installs either 32bit or 64bit MSYS2. It does NOT work with `choco install -x86` (forced 32bit installation) under 64bit Windows. There is usually no need to install a 32bit MSYS2 under 64bit Windows, because MSYS2 always contains a MINGW32 and a MINGW64 environment.
 
 The MSYS2 archive will be extracted to Chocolatey's **BinRoot** (usually **C:\\Tools\\**). The 32bit variant uses an **msys32\\** root folder and the 64bit variant uses **msys64\\** respectively. The MSYS2 root folder will be appended to `%PATH%`. It contains the **msys2\_shell.bat**, **mingw32\_shell.bat**, and **mingw64\_shell.bat** scripts. No **bin\\** folders will be added to `%PATH%`. After unpacking, MSYS2 will be automatically initialized and updated with Pacman according to the [official instructions](https://msys2.github.io).
 
 MSYS2 itself will not be removed on uninstalling the Chocolatey package and will not be downloaded and extracted again (even if the MSYS2 archive version has changed) on updating or reinstalling the Chocolatey package. The existing MSYS2 will just be updated with Pacman.
 
-Chocolatey MSYS2 offers an extra **msystem.bat** script in its package folder (which will also be appended to `%PATH%`). The script can be used to activate and switch **MSYS**, **MINGW32**, and **MINGW64** environments inside a CMD shell without running Bash. It will prepend the appropriate **bin\\** folders to `%PATH%`. Call `msystem /?` after installation or look at the top of the script file for details. More extra features (like better integration with other shell environments and wrapper scripts for `bash`, `pacman`, and `makepkg`) and an according PowerShell module will be added in future releases of Chocolatey MSYS2.
+Chocolatey MSYS2 offers an extra **msystem.bat** script in its package folder (which will also be appended to `%PATH%`). The script can be used to activate and switch **MSYS**, **MINGW32**, and **MINGW64** environments inside a CMD shell without running Bash. It will prepend the appropriate **bin\\** folders to `%PATH%`. **MSYS** mode additionally provides **bash.bat** and **pacman.bat** wrapper scripts and according auto-completion scripts for Clink. Call `msystem /?` after installation or look at the top of the script file for more details. These extra features and even more (like better integration with other shell environments, a better **bash.bat**, and more wrapper scripts for tools like `makepkg`, ..., and an according PowerShell module) will be moved from the Chocolatey MSYS2 package to separate projects, which will then be installable as MSYS2 packages, of course auto-installed by Chocolatey MSYS2 :)
     </description>
     <projectUrl>http://msys2.github.io</projectUrl>
-    <tags>msys2 msys cygwin mingw w64 gnu linux unix posix arch pacman bash gcc cmd powershell posh</tags>
+    <tags>msys2 msys cygwin mingw w64 gnu linux unix posix arch pacman bash makepkg gcc cmd clink powershell posh</tags>
     <copyright>MSYS2 Copyright (c) 2013, Алексей</copyright>
     <licenseUrl>https://github.com/userzimmermann/choco-packages/blob/master/msys2/NOTICE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/msys2/tools/chocolateyinstall.ps1 b/msys2/tools/chocolateyinstall.ps1
@@ -8,12 +8,12 @@ $ErrorActionPreference = 'Stop';
 
 $packageName = 'msys2'
 
-$url = 'http://downloads.sourceforge.net/msys2/Base/i686/msys2-base-i686-20150512.tar.xz'
-$checksum = '18f33537212bca9552659012a16d8c511ef5fc23'
+$url = 'http://downloads.sourceforge.net/msys2/Base/i686/msys2-base-i686-20150916.tar.xz'
+$checksum = 'c0f87ca4e5b48d72c152305c11841551029d4257'
 $checksumType = 'SHA1'
 
-$url64 = 'http://downloads.sourceforge.net/msys2/Base/x86_64/msys2-base-x86_64-20150512.tar.xz'
-$checksum64 = '88fa66ac2a18715a542e0768b1af9b2f6e3680b2'
+$url64 = 'http://downloads.sourceforge.net/msys2/Base/x86_64/msys2-base-x86_64-20150916.tar.xz'
+$checksum64 = 'abc08265b90f68e8f68c74e833f42405e85df4ee'
 $checksumType64 = 'SHA1'
 
 $toolsDir = Split-Path -parent $MyInvocation.MyCommand.Definition