Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
* stable:
  (version) 0.9.9.10
  (maint) don't print choco version every command
  (doc) prep release notes for 0.9.9.10

# Conflicts:
#	.uppercut
#	CHANGELOG.md
  • Loading branch information
ferventcoder committed Oct 3, 2015
2 parents 21789bc + 98b4c47 commit 0ec22c8
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 6 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ Alternative sources (webpi, windowsfeature, cygwin, etc) are back (finally, righ

* AutoUninstaller is on by default - see [#308](https://github.com/chocolatey/choco/issues/308)

## [0.9.9.10](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.10+is%3Aclosed) (October 3, 2015)

Not to be confused with 0.9.10 (this is not that version). This fixes a small but extremely significant issue with relation to configuration managers and other tools that use choco.

### BUG FIXES

* Fix - List output for other tools messed up in 0.9.9.9 (pipe separator missing) - see [#450](https://github.com/chocolatey/choco/issues/450)
* Fix - accidentally escaped characters in "new" -help - see [#447](https://github.com/chocolatey/choco/issues/447)

## [0.9.9.9](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.9+is%3Aclosed) (October 2, 2015)

With this release you can completely configure choco from the command line (including the priority of sources). Choco now allows you to create [custom package templates](https://github.com/chocolatey/choco/issues/76). Choco has [proper proxy support](https://github.com/chocolatey/choco/issues/243) now. We also squashed up some bugs, like the infinite download loop that happens if the connection is lost. We've also improved the installation experience of Chocolatey itself, [unpacking all of the required setup files in the chocolatey package](https://github.com/chocolatey/choco/issues/347) and improving the messaging output during the bootstrapping process. Chocolatey also [doesn't try to write config updates every command](https://github.com/chocolatey/choco/issues/364), unless something actually changes in the config file. And last but not least for mentions, the issue of [choco not recognizing itself as needing upgraded after being installed by the bootstrapper](https://github.com/chocolatey/choco/issues/414) is now fixed.
Expand Down
13 changes: 11 additions & 2 deletions nuget/chocolatey/chocolatey.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ There are quite a few commands you can call - you should check out the [command
* Upgrade - choco upgrade baretail
* Uninstall - choco uninstall baretail

Alternative installation sources (TEMPORARILY DISABLED IN 0.9.9):
Alternative installation sources (TEMPORARILY DISABLED IN 0.9.9 series):
* Install ruby gem - choco install compass -source ruby
* Install python egg - choco install sphynx -source python
* Install windows feature - choco install IIS -source windowsfeatures
Expand All @@ -40,7 +40,16 @@ In that mess there is a link to the [Helper Reference](https://github.com/chocol
<releaseNotes>
See all - https://github.com/chocolatey/choco/blob/master/CHANGELOG.md

## 0.9.9.9
## 0.9.9.10

Not to be confused with 0.9.10 (this is not that version). This fixes a small but extremely significant issue with relation to configuration managers and other tools that use choco.

### BUG FIXES

* Fix - List output for other tools messed up in 0.9.9.9 (pipe separator missing) - see [#450](https://github.com/chocolatey/choco/issues/450)
* Fix - accidentally escaped characters in "new" -help - see [#447](https://github.com/chocolatey/choco/issues/447)

## 0.9.9.9

With this release you can completely configure choco from the command line (including the priority of sources). Choco now allows you to create [custom package templates](https://github.com/chocolatey/choco/issues/76). Choco has [proper proxy support](https://github.com/chocolatey/choco/issues/243) now. We also squashed up some bugs, like the infinite download loop that happens if the connection is lost. We've also improved the installation experience of Chocolatey itself, [unpacking all of the required setup files in the chocolatey package](https://github.com/chocolatey/choco/issues/347) and improving the messaging output during the bootstrapping process. Chocolatey also [doesn't try to write config updates every command](https://github.com/chocolatey/choco/issues/364), unless something actually changes in the config file. And last but not least for mentions, the issue of [choco not recognizing itself as needing upgraded after being installed by the bootstrapper](https://github.com/chocolatey/choco/issues/414) is now fixed.

Expand Down
14 changes: 10 additions & 4 deletions src/chocolatey.console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,19 @@ private static void Main(string[] args)
if (config.RegularOutput)
{
"logfile".Log().Info(() => "".PadRight(60, '='));

#if DEBUG
"chocolatey".Log().Info(ChocolateyLoggers.Important, () => "{0} v{1} (DEBUG BUILD)".format_with(ApplicationParameters.Name, config.Information.ChocolateyProductVersion));
#else
var versionLog = config.Information.ChocolateyVersion == config.Information.ChocolateyProductVersion ? "logfile" : "chocolatey";
versionLog.Log().Info(ChocolateyLoggers.Important, () => "{0} v{1}".format_with(ApplicationParameters.Name, config.Information.ChocolateyProductVersion));
#else
if (config.Information.ChocolateyVersion == config.Information.ChocolateyProductVersion)
{
"logfile".Log().Info(() => "{0} v{1}".format_with(ApplicationParameters.Name, config.Information.ChocolateyProductVersion));
}
else
{
"chocolatey".Log().Info(ChocolateyLoggers.Important, () => "{0} v{1}".format_with(ApplicationParameters.Name, config.Information.ChocolateyProductVersion));
}
#endif

}

if (warnings.Count != 0 && config.RegularOutput)
Expand Down

0 comments on commit 0ec22c8

Please sign in to comment.