Skip to content

Commit

Permalink
(chocolateyGH-14) use the packagenames separator
Browse files Browse the repository at this point in the history
  • Loading branch information
ferventcoder committed Jun 4, 2015
1 parent 66e98ea commit 60c99cb
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu
var args = build_args(config, _installArguments);
var packageResults = new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);

foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries))
foreach (var packageToInstall in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries))
{
var argsForPackage = args.Replace(PACKAGE_NAME_TOKEN, packageToInstall);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu
var packageResults = new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);
var args = ExternalCommandArgsBuilder.build_arguments(config, _installArguments);

foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries))
foreach (var packageToInstall in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries))
{
var argsForPackage = args.Replace(PACKAGE_NAME_TOKEN, packageToInstall);
var exitCode = _commandExecutor.execute(
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey/infrastructure.app/services/WebPiService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu
var packageResults = new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);
var args = ExternalCommandArgsBuilder.build_arguments(config, _installArguments);

foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries))
foreach (var packageToInstall in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries))
{
var argsForPackage = args.Replace(PACKAGE_NAME_TOKEN, packageToInstall);
var exitCode = _commandExecutor.execute(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu
var args = build_args(config, _installArguments);
var packageResults = new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);

foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries))
foreach (var packageToInstall in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries))
{
var packageName = packageToInstall;
var results = packageResults.GetOrAdd(packageToInstall, new PackageResult(packageName, null, null));
Expand Down Expand Up @@ -333,7 +333,7 @@ public ConcurrentDictionary<string, PackageResult> uninstall_run(ChocolateyConfi
var args = build_args(config, _uninstallArguments);
var packageResults = new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);

foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries))
foreach (var packageToInstall in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries))
{
var packageName = packageToInstall;
var results = packageResults.GetOrAdd(packageToInstall, new PackageResult(packageName, null, null));
Expand Down

0 comments on commit 60c99cb

Please sign in to comment.