Skip to content
This repository has been archived by the owner on Feb 19, 2019. It is now read-only.

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
* stable:
  0.9.8.30-beta1
  (doc) update changelog/nuspec
  • Loading branch information
ferventcoder committed Jan 6, 2015
2 parents d184fc3 + f3f343b commit 7bab644
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
##[0.9.8.30](https://github.com/chocolatey/chocolatey/issues?labels=v0.9.8.30&page=1&state=closed) (unreleased)

FEATURES:

* Use icon of the executable with generated shim - [#579](https://github.com/chocolatey/chocolatey/issues/579) & [ShimGen #2](https://github.com/chocolatey/shimgen/issues/2)

BUG FIXES:

* Fix - Shims don't correctly handle spaces in path to shim - [#654](https://github.com/chocolatey/chocolatey/issues/654) & [ShimGen #5](https://github.com/chocolatey/shimgen/issues/5)

##[0.9.8.29](https://github.com/chocolatey/chocolatey/issues?labels=v0.9.8.29&page=1&state=closed) (January 2, 2015)

FEATURES:
Expand Down
12 changes: 11 additions & 1 deletion nuget/chocolatey.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>chocolatey</id>
<title>Chocolatey</title>
<version>0.9.8.29</version>
<version>0.9.8.30-beta1</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>
Expand Down Expand Up @@ -41,6 +41,16 @@ 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.30

### FEATURES:

* Use icon of the executable with generated shim - https://github.com/chocolatey/chocolatey/issues/579 and https://github.com/chocolatey/shimgen/issues/2

### BUG FIXES:

* Fix - Shims don't correctly handle spaces in path to shim - https://github.com/chocolatey/chocolatey/issues/654 and https://github.com/chocolatey/shimgen/issues/5

## 0.9.8.29:

### FEATURES:
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ $currentThread.CurrentCulture = $culture;
$currentThread.CurrentUICulture = $culture;

#Let's get Chocolatey!
$chocVer = '0.9.8.29'
$chocVer = '0.9.8.30-beta1'
$nugetChocolateyPath = (Split-Path -parent $MyInvocation.MyCommand.Definition)
$nugetPath = (Split-Path -Parent $nugetChocolateyPath)
$nugetExePath = Join-Path $nuGetPath 'bin'
Expand Down

0 comments on commit 7bab644

Please sign in to comment.