Skip to content

Join multiple paths in one call to Join-Path #2014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dlwyatt wants to merge 3 commits into from
Closed

Join multiple paths in one call to Join-Path #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a194118
Join multiple paths in one call
dlwyatt Aug 22, 2016
203ace0
Using Utils.EmptyArray for parameter default value
dlwyatt Aug 22, 2016
e24f3fa
AdditionalChildPath parameter on Join-Path
dlwyatt Aug 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/CombinePathCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
--********************************************************************/

using System;
using System.Text;
using System.Collections.ObjectModel;
using System.Management.Automation;
using Dbg = System.Management.Automation;
Expand Down Expand Up @@ -32,7 +33,17 @@ public class JoinPathCommand : CoreCommandWithCredentialsBase
[Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true)]
[AllowNull]
[AllowEmptyString]
public string ChildPath { get; set; } = String.Empty;
public string ChildPath { get; set; }

/// <summary>
/// Gets or sets additional childPaths to the command.
/// </summary>

[Parameter(Position = 2, Mandatory = false, ValueFromPipelineByPropertyName = true, ValueFromRemainingArguments = true)]
[AllowNull]
[AllowEmptyString]
[AllowEmptyCollection]
public string[] AdditionalChildPath { get; set; } = Utils.EmptyArray<string>();

/// <summary>
/// Determines if the path should be resolved after being joined
Expand All @@ -55,6 +66,17 @@ protected override void ProcessRecord()
Path != null,
"Since Path is a mandatory parameter, paths should never be null");

string combinedChildPath = ChildPath;

// join the ChildPath elements
if (AdditionalChildPath != null)
{
foreach (string childPath in AdditionalChildPath)
{
combinedChildPath = SessionState.Path.Combine(combinedChildPath, childPath, CmdletProviderContext);
}
}

foreach (string path in Path)
{
// First join the path elements
Expand All @@ -64,7 +86,7 @@ protected override void ProcessRecord()
try
{
joinedPath =
SessionState.Path.Combine(path, ChildPath, CmdletProviderContext);
SessionState.Path.Combine(path, combinedChildPath, CmdletProviderContext);
}
catch (PSNotSupportedException notSupported)
{
Expand Down
5 changes: 5 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Join-Path.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,9 @@ Describe "Join-Path cmdlet tests" -Tags "CI" {
$result.Count | Should be 1
$result | Should BeExactly ("Env:"+$SepChar+"foo")
}
It "should be able to join multiple child paths passed by position with remaining arguments" {
$result = Join-Path one two three four five
$result.Count | Should Be 1
$result | Should BeExactly "one${sepChar}two${sepChar}three${sepChar}four${sepChar}five"
}
}