Merge branch 'stable'

* stable: (doc) update changelog / nuspec (GH-265) Mention how to auto confirm prompts (GH-279) Resolve packages on first feed found (maint) formatting (GH-271) Replace /I with /X on uninstall
chocolatey · May 16, 2015 · 9417a5b · 9417a5b
2 parents edaa44c + a5b418b
commit 9417a5b
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## [0.9.9.6](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.6+is%3Aclosed) (unreleased)
+
+Some really large fixes this release, especially removing all files that are installed to the package directory if they haven't changed, including ensuring that the nupkg file is always removed on successful uninstalls. The really big add some folks are going to like is the new outdated command. Some more variables that were misused have been brought back, which allows some packages (like Atom) to be installed again without issue. If you can believe some people never read these, we decided to add a note to the installer prompt to let people know about -y.
+
+### FEATURES
+
+ * Outdated Command - Use `choco outdated` to see outdated packages - see [#170](https://github.com/chocolatey/choco/issues/170)
+
+### BUG FIXES
+
+ * Fix - NotSilent Switch Not Working - see [#281](https://github.com/chocolatey/choco/issues/281)
+ * Fix - Silent installation of choco without admin is not possible - see [#274](https://github.com/chocolatey/choco/issues/274)
+ * Fix - Package resolves to latest version from any source - see [#279](https://github.com/chocolatey/choco/issues/279)
+ * Fix - Install fails when shortcut creation fails - see [#264](https://github.com/chocolatey/choco/issues/264)
+ * Fix - Error deserializing response of type Registry - see [#257](https://github.com/chocolatey/choco/issues/257)
+ * Fix - Auto uninstaller should not depend on optional InstallLocation value - see [#255](https://github.com/chocolatey/choco/issues/255)
+ * Fix - Nupkg is left but reported as successfully uninstalled by NuGet - see [#254](https://github.com/chocolatey/choco/issues/254)
+ * Fix - SHA1 checksum compared as MD5 for Install-ChocolateyZipPackage - see [#253](https://github.com/chocolatey/choco/issues/253)
+ * Fix - Auto uninstaller strips off "/" and "-" in arguments - see [#212](https://github.com/chocolatey/choco/issues/212)
+
+### IMPROVEMENTS
+
+ * Uninstall removes all installed files if unchanged - see [#121](https://github.com/chocolatey/choco/issues/121)
+ * Auto uninstaller should convert /I to /X for Msi Uninstalls - see [#271](https://github.com/chocolatey/choco/issues/271)
+ * Bring back more variables for feature parity - see [#267](https://github.com/chocolatey/choco/issues/267)
+ * Mention -y in the prompt - see [#265](https://github.com/chocolatey/choco/issues/265)
+
 ## [0.9.9.5](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.5+is%3Aclosed) (April 20, 2015)
 
 ### BREAKING CHANGES

diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec
@@ -40,7 +40,34 @@ 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.5
+## 0.9.9.6
+
+Some really large fixes this release, especially removing all files that are installed to the package directory if they haven't changed, including ensuring that the nupkg file is always removed on successful uninstalls. The really big add some folks are going to like is the new outdated command. Some more variables that were misused have been brought back, which allows some packages (like Atom) to be installed again without issue. If you can believe some people never read these, we decided to add a note to the installer prompt to let people know about -y.
+
+### FEATURES
+
+ * Outdated Command - Use `choco outdated` to see outdated packages - see [#170](https://github.com/chocolatey/choco/issues/170)
+
+### BUG FIXES
+
+ * Fix - NotSilent Switch Not Working - see [#281](https://github.com/chocolatey/choco/issues/281)
+ * Fix - Silent installation of choco without admin is not possible - see [#274](https://github.com/chocolatey/choco/issues/274)
+ * Fix - Package resolves to latest version from any source - see [#279](https://github.com/chocolatey/choco/issues/279)
+ * Fix - Install fails when shortcut creation fails - see [#264](https://github.com/chocolatey/choco/issues/264)
+ * Fix - Error deserializing response of type Registry - see [#257](https://github.com/chocolatey/choco/issues/257)
+ * Fix - Auto uninstaller should not depend on optional InstallLocation value - see [#255](https://github.com/chocolatey/choco/issues/255)
+ * Fix - Nupkg is left but reported as successfully uninstalled by NuGet - see [#254](https://github.com/chocolatey/choco/issues/254)
+ * Fix - SHA1 checksum compared as MD5 for Install-ChocolateyZipPackage - see [#253](https://github.com/chocolatey/choco/issues/253)
+ * Fix - Auto uninstaller strips off "/" and "-" in arguments - see [#212](https://github.com/chocolatey/choco/issues/212)
+
+### IMPROVEMENTS
+
+ * Uninstall removes all installed files if unchanged - see [#121](https://github.com/chocolatey/choco/issues/121)
+ * Auto uninstaller should convert /I to /X for Msi Uninstalls - see [#271](https://github.com/chocolatey/choco/issues/271)
+ * Bring back more variables for feature parity - see [#267](https://github.com/chocolatey/choco/issues/267)
+ * Mention -y in the prompt - see [#265](https://github.com/chocolatey/choco/issues/265)
+
+## 0.9.9.5
 
 ### BREAKING CHANGES
 

diff --git a/src/chocolatey/infrastructure.app/nuget/NugetCommon.cs b/src/chocolatey/infrastructure.app/nuget/NugetCommon.cs
@@ -80,7 +80,7 @@ public static IPackageRepository GetRemoteRepository(ChocolateyConfiguration con
 
             //todo well that didn't work on failing repos... grrr
             var repository = new AggregateRepository(repositories) {IgnoreFailingRepositories = true};
-            //repository.ResolveDependenciesVertically = true;
+            repository.ResolveDependenciesVertically = true;
             if (configuration.Debug)
             {
                 repository.Logger = nugetLogger;

diff --git a/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs b/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs
@@ -82,8 +82,7 @@ public void run(PackageResult packageResult, ChocolateyConfiguration config)
                 var uninstallArgs = key.UninstallString.to_string().Replace(uninstallExe.to_string(), string.Empty);
                 uninstallExe = uninstallExe.remove_surrounding_quotes();
                 this.Log().Debug(() => " Uninstaller path is '{0}'".format_with(uninstallExe));
-
-                //todo: ultimately we should merge keys with logging
+
                 if (!key.HasQuietUninstall)
                 {
                     IInstaller installer = new CustomInstaller();
@@ -109,14 +108,25 @@ public void run(PackageResult packageResult, ChocolateyConfiguration config)
 
                     this.Log().Debug(() => " Installer type is '{0}'".format_with(installer.GetType().Name));
 
+
+                    //todo: ultimately we should merge keys with logging
                     uninstallArgs += " " + installer.build_uninstall_command_arguments();
                 }
 
+                if (key.InstallerType == InstallerType.Msi)
+                {
+                    //because sometimes the key is set with /i to allow for modify :/
+                    uninstallArgs = uninstallArgs.Replace("/I{", "/X{");
+                    uninstallArgs = uninstallArgs.Replace("/i{", "/X{");
+                    uninstallArgs = uninstallArgs.Replace("/I ", "/X ");
+                    uninstallArgs = uninstallArgs.Replace("/i ", "/X ");
+                }
+
                 this.Log().Debug(() => " Args are '{0}'".format_with(uninstallArgs));
 
                 var exitCode = _commandExecutor.execute(
                     uninstallExe,
-                    uninstallArgs.trim_safe(), 
+                    uninstallArgs.trim_safe(),
                     config.CommandExecutionTimeoutSeconds,
                     (s, e) =>
                         {

diff --git a/src/chocolatey/infrastructure.app/services/PowershellService.cs b/src/chocolatey/infrastructure.app/services/PowershellService.cs
@@ -217,6 +217,8 @@ public bool run_action(ChocolateyConfiguration configuration, PackageResult pack
                 {
                     this.Log().Info(ChocolateyLoggers.Important, () => "The package {0} wants to run '{1}'.".format_with(package.Id, _fileSystem.get_file_name(chocoPowerShellScript)));
                     this.Log().Info(ChocolateyLoggers.Important, () => "Note: If you don't run this script, the installation will fail.");
+                    this.Log().Info(ChocolateyLoggers.Important, () => @"Note: To confirm automatically next time, use '-y' or consider setting 
+ 'allowGlobalConfirmation'. Run 'choco feature -h' for more details.");
 
                     var selection = InteractivePrompt.prompt_for_confirmation(@"Do you want to run the script?", new[] {"yes", "no", "print"}, defaultChoice: null, requireAnswer: true);