Merge branch 'stable'

* stable: 0.9.8.28-alpha2 (doc) add documentation surrounding checksum & checksumtype (GH-535) Use 32bit checksum/checksumtype when force x86
chocolatey-archive · Aug 1, 2014 · 361389b · 361389b
2 parents 8e4819c + e84573d
commit 361389b
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 BUG FIXES:
 
+ * Fix - Forcing x86 does not use 32bit checksum - [#535](https://github.com/chocolatey/chocolatey/issues/535)
  * Fix - Powershell v2 fails to download SSLv3 files - [#531](https://github.com/chocolatey/chocolatey/issues/531)
 
 ##[0.9.8.27](https://github.com/chocolatey/chocolatey/issues?labels=v0.9.8.27&page=1&state=closed) (July 13, 2014)

diff --git a/nuget/chocolatey.nuspec b/nuget/chocolatey.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>chocolatey</id>
     <title>Chocolatey</title>
-    <version>0.9.8.28-alpha1</version>
+    <version>0.9.8.28-alpha2</version>
     <authors>Rob Reynolds, The Chocolatey Team</authors>
     <owners>Rob Reynolds</owners>
     <summary>Chocolatey is your machine level NuGet repository. Think apt-get for Windows (executables/application packages), not library packages.</summary>
@@ -41,9 +41,11 @@ Humor related to playing off of tiki gods. We like humor. Don't take life so ser
     <releaseNotes>
 See all - https://github.com/chocolatey/chocolatey/blob/master/CHANGELOG.md
 
-## 0.9.8.28:
-### BUG FIXES:
+## 0.9.8.28:
 
+### BUG FIXES:
+
+ * Fix - Forcing x86 does not use 32bit checksum - https://github.com/chocolatey/chocolatey/issues/535
  * Fix - Powershell v2 fails to download SSLv3 files - https://github.com/chocolatey/chocolatey/issues/531
 
 ## 0.9.8.27:

diff --git a/src/chocolatey.ps1 b/src/chocolatey.ps1
@@ -44,7 +44,7 @@ $currentThread.CurrentCulture = $culture;
 $currentThread.CurrentUICulture = $culture;
 
 #Let's get Chocolatey!
-$chocVer = '0.9.8.28-alpha1'
+$chocVer = '0.9.8.28-alpha2'
 $nugetChocolateyPath = (Split-Path -parent $MyInvocation.MyCommand.Definition)
 $nugetPath = (Split-Path -Parent $nugetChocolateyPath)
 $nugetExePath = Join-Path $nuGetPath 'bin'

diff --git a/src/helpers/functions/Get-ChocolateyWebFile.ps1 b/src/helpers/functions/Get-ChocolateyWebFile.ps1
@@ -20,9 +20,18 @@ This is the url to download the file from.
 .PARAMETER Url64bit
 OPTIONAL - If there is an x64 installer to download, please include it here. If not, delete this parameter
 
-.PARAMETER CheckSum
+.PARAMETER Checksum
 OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
 
+.PARAMETER Checksum64
+OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
+
+.PARAMETER ChecksumType
+OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to 'md5'
+
+.PARAMETER ChecksumType64
+OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to ChecksumType
+
 .EXAMPLE
 Get-ChocolateyWebFile '__NAME__' 'C:\somepath\somename.exe' 'URL' '64BIT_URL_DELETE_IF_NO_64BIT'
 
@@ -46,6 +55,8 @@ param(
   Write-Debug "Running 'Get-ChocolateyWebFile' for $packageName with url:`'$url`', fileFullPath:`'$fileFullPath`', url64bit:`'$url64bit`', checksum: `'$checksum`', checksumType: `'$checksumType`', checksum64: `'$checksum64`', checksumType64: `'$checksumType64`'";
 
   $url32bit = $url;
+  $checksum32 = $checksum
+  $checksumType32 = $checksumType
   $bitWidth = 32
   if (Get-ProcessorBits 64) {
     $bitWidth = 64
@@ -70,6 +81,8 @@ param(
     Write-Debug "User specified -x86 so forcing 32 bit"
     $bitPackage = 32
     $url = $url32bit
+    $checksum =  $checksum32
+    $checksumType = $checksumType32
   }
 
   $headers = @{}

diff --git a/src/helpers/functions/Install-ChocolateyPackage.ps1 b/src/helpers/functions/Install-ChocolateyPackage.ps1
@@ -27,6 +27,19 @@ This is the url to download the file from.
 .PARAMETER Url64bit
 OPTIONAL - If there is an x64 installer to download, please include it here. If not, delete this parameter
 
+.PARAMETER Checksum
+OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
+
+.PARAMETER Checksum64
+OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
+
+.PARAMETER ChecksumType
+OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to 'md5'
+
+.PARAMETER ChecksumType64
+OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to ChecksumType
+
+
 .EXAMPLE
 Install-ChocolateyPackage '__NAME__' 'EXE_OR_MSI' 'SILENT_ARGS' 'URL' '64BIT_URL_DELETE_IF_NO_64BIT'
 

diff --git a/src/helpers/functions/Install-ChocolateyVsixPackage.ps1 b/src/helpers/functions/Install-ChocolateyVsixPackage.ps1
@@ -17,6 +17,12 @@ package should be installed. This is optional. If not
 specified, the most recent Visual Studio installation
 will be targetted.
 
+.PARAMETER Checksum
+OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
+
+.PARAMETER ChecksumType
+OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to 'md5'
+
 .EXAMPLE
 Install-ChocolateyVsixPackage "MyPackage" http://visualstudiogallery.msdn.microsoft.com/ea3a37c9-1c76-4628-803e-b10a109e7943/file/73131/1/AutoWrockTestable.vsix
 

diff --git a/src/helpers/functions/Install-ChocolateyZipPackage.ps1 b/src/helpers/functions/Install-ChocolateyZipPackage.ps1
@@ -19,6 +19,18 @@ OPTIONAL - If there is an x64 installer to download, please include it here. If
 .PARAMETER UnzipLocation
 This is a location to unzip the contents to, most likely your script folder.
 
+.PARAMETER Checksum
+OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
+
+.PARAMETER Checksum64
+OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
+
+.PARAMETER ChecksumType
+OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to 'md5'
+
+.PARAMETER ChecksumType64
+OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to ChecksumType
+
 .EXAMPLE
 Install-ChocolateyZipPackage '__NAME__' 'URL' "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"