From 51a9c11e33cdb5cba4a7852487a2fc15b6b6d597 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Mon, 15 Mar 2021 15:26:01 +0300
Subject: [PATCH] Add support for latest zstd (#2927)

---
 images/win/scripts/Installers/Install-Zstd.ps1 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/images/win/scripts/Installers/Install-Zstd.ps1 b/images/win/scripts/Installers/Install-Zstd.ps1
index cfbb94fb..f29ea581 100644
--- a/images/win/scripts/Installers/Install-Zstd.ps1
+++ b/images/win/scripts/Installers/Install-Zstd.ps1
@@ -10,8 +10,15 @@ $zstdArchivePath = Start-DownloadWithRetry -Url $zstdLatest -Name "zstd-win64.zi
 
 $toolPath = "C:\tools"
 $zstdPath = Join-Path $toolPath zstd
-Extract-7Zip -Path $zstdArchivePath -DestinationPath $toolPath
-Move-Item -Path "${zstdPath}*" -Destination $zstdPath
+$zstdParentName = [IO.Path]::GetFileNameWithoutExtension($zstdLatest)
+$filesInArchive = 7z l $zstdArchivePath | Out-String
+
+if ($filesInArchive.Contains($zstdParentName)) {
+    Extract-7Zip -Path $zstdArchivePath -DestinationPath $toolPath
+    Move-Item -Path "${zstdPath}*" -Destination $zstdPath
+} else {
+    Extract-7Zip -Path $zstdArchivePath -DestinationPath $zstdPath
+}
 
 # Add zstd-win64 to PATH
 Add-MachinePathItem $zstdPath