aphrody-labs/PowerShell
1
0 Fork 0
mirror of https://github.com/aphrody-labs/PowerShell.git synced 2026-10-17 04:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix Archive module to work correctly when the DirectorySeparatorChar is "/"

Browse Source 
rather than use either "/" or "\", just use [io.path]::DirectorySeparatorChar
This commit is contained in:
James Truher committed 2016-08-02 12:05:24 -07:00
1 parent 176f9fb6bd
commit d23a5fddc7
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/Modules/Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1
+5 -5
View File
@@ -662,13 +662,13 @@ function CompressSingleDirHelper
} }
else else
{ {
$modifiedSourceDirFullName = $sourceDirFullName + "\" $modifiedSourceDirFullName = $sourceDirFullName + ([io.path]::DirectorySeparatorChar)
} }
} }
else else
{ {
$sourceDirFullName = $sourceDirPath $sourceDirFullName = $sourceDirPath
$modifiedSourceDirFullName = $sourceDirFullName + "\" $modifiedSourceDirFullName = $sourceDirFullName + ([io.path]::DirectorySeparatorChar)
} }
$dirContents = Get-ChildItem -LiteralPath $sourceDirPath -Recurse $dirContents = Get-ChildItem -LiteralPath $sourceDirPath -Recurse
@@ -688,7 +688,7 @@ function CompressSingleDirHelper
$files = $currentContent.GetFiles() $files = $currentContent.GetFiles()
if($files.Count -eq 0) if($files.Count -eq 0)
{ {
$subDirFiles.Add($currentContent.FullName + "\") $subDirFiles.Add($currentContent.FullName + ([io.path]::DirectorySeparatorChar))
} }
} }
} }
@@ -780,7 +780,7 @@ function ZipArchiveHelper
# If a directory needs to be added to an archive file, # If a directory needs to be added to an archive file,
# by convention the .Net API's expect the path of the diretcory # by convention the .Net API's expect the path of the diretcory
# to end with '\' to detect the path as an directory. # to end with '\' to detect the path as an directory.
if(!$relativeFilePath.EndsWith("\", [StringComparison]::OrdinalIgnoreCase)) if(!$relativeFilePath.EndsWith(([io.path]::DirectorySeparatorChar), [StringComparison]::OrdinalIgnoreCase))
{ {
try try
{ {
@@ -951,7 +951,7 @@ function ExpandArchiveHelper
# The current archive entry is an empty directory # The current archive entry is an empty directory
# The FullName of the Archive Entry representing a directory would end with a trailing '\'. # The FullName of the Archive Entry representing a directory would end with a trailing '\'.
if($extension -eq [string]::Empty -and if($extension -eq [string]::Empty -and
$currentArchiveEntryPath.EndsWith("\", [StringComparison]::OrdinalIgnoreCase)) $currentArchiveEntryPath.EndsWith(([io.path]::DirectorySeparatorChar), [StringComparison]::OrdinalIgnoreCase))
{ {
$pathExists = Test-Path -LiteralPath $currentArchiveEntryPath $pathExists = Test-Path -LiteralPath $currentArchiveEntryPath