diff options
| author | Patrick Lehmann <Paebbels@gmail.com> | 2018-10-28 23:12:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-28 23:12:15 +0100 |
| commit | c194a74d456399e0d667c505127c29cf65b53319 (patch) | |
| tree | ce245e101836987922e22157e2e93f77582f2bb4 | |
| parent | 5a97d9f219e116bd62b64294dc3d95678b3415f8 (diff) | |
| parent | e4188e27b313e8e8accc4988944e04db2e9ae9b5 (diff) | |
| download | ghdl-c194a74d456399e0d667c505127c29cf65b53319.tar.gz ghdl-c194a74d456399e0d667c505127c29cf65b53319.tar.bz2 ghdl-c194a74d456399e0d667c505127c29cf65b53319.zip | |
Merge pull request #681 from dotSK/fix/powershell-windows-install
PowerShell Windows installation fix.
Fixes #681. Fixes #678.
| -rw-r--r-- | dist/windows/InstallerTemplate.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/windows/InstallerTemplate.ps1 b/dist/windows/InstallerTemplate.ps1 index 54c1894a1..f04a89ad4 100644 --- a/dist/windows/InstallerTemplate.ps1 +++ b/dist/windows/InstallerTemplate.ps1 @@ -205,13 +205,13 @@ if ($Install) New-Item -ItemType Directory -Path "$InstallPath" -ErrorAction SilentlyContinue | Out-Null # writing ZIP file to disk - $TempFilePath = [System.IO.Path]::GetTempFileName() + $TempFilePath = [System.IO.Path]::GetTempFileName().TrimEnd("tmp") + "zip" Write-Host " Writing temporary ZIP file: $TempFilePath" $CompressedFileContentAsBytes = [System.Convert]::FromBase64String($CompressedFileContentInBase64) [System.IO.File]::WriteAllBytes("$TempFilePath", $CompressedFileContentAsBytes) Write-Host " Extracting ZIP file to: $InstallPath" - Expand-Archive "$TempFilePath" -OutputPath $InstallPath -Force -ShowProgress + Microsoft.PowerShell.Archive\Expand-Archive "$TempFilePath" -DestinationPath $InstallPath -Force Remove-Item $TempFilePath |