Skip to content

Commit

Permalink
(GH-134) Allow packages to have .config in name
Browse files Browse the repository at this point in the history
Just not to end with .config, as that is reserved for packages.config.
  • Loading branch information
ferventcoder committed Mar 2, 2015
1 parent 7a63a29 commit 8d28505
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu
private IEnumerable<ChocolateyConfiguration> set_config_from_package_names_and_packages_config(ChocolateyConfiguration config, ConcurrentDictionary<string, PackageResult> packageInstalls)
{
// if there are any .config files, split those off of the config. Then return the config without those package names.
foreach (var packageConfigFile in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().Where(p => p.Contains(".config")).ToList())
foreach (var packageConfigFile in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().Where(p => p.EndsWith(".config")).ToList())
{
config.PackageNames = config.PackageNames.Replace(packageConfigFile, string.Empty);

Expand Down Expand Up @@ -359,7 +359,7 @@ public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfigu
this.Log().Info(ChocolateyLoggers.Important, @"{0}".format_with(config.PackageNames));
this.Log().Info(@"By upgrading you accept licenses for the packages.");

foreach (var packageConfigFile in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().Where(p => p.Contains(".config")).ToList())
foreach (var packageConfigFile in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().Where(p => p.EndsWith(".config")).ToList())
{
throw new ApplicationException("A packages.config file is only used with installs.");
}
Expand Down Expand Up @@ -415,7 +415,7 @@ public ConcurrentDictionary<string, PackageResult> uninstall_run(ChocolateyConfi
this.Log().Info(@"Uninstalling the following packages:");
this.Log().Info(ChocolateyLoggers.Important, @"{0}".format_with(config.PackageNames));

foreach (var packageConfigFile in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().Where(p => p.Contains(".config")).ToList())
foreach (var packageConfigFile in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().Where(p => p.EndsWith(".config")).ToList())
{
throw new ApplicationException("A packages.config file is only used with installs.");
}
Expand Down

0 comments on commit 8d28505

Please sign in to comment.