From cc2ac9ac2fff592829e25aac3c173351fb4cba8e Mon Sep 17 00:00:00 2001
From: doylet <doyle.thai@aosgrp.com>
Date: Tue, 16 Jan 2024 11:26:39 +1100
Subject: [PATCH] Support older zstd versions that don't have output-flat-dir

---
 devenver.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/devenver.py b/devenver.py
index e609059..d8b1358 100644
--- a/devenver.py
+++ b/devenver.py
@@ -269,8 +269,11 @@ def download_and_install_archive(download_url,
                 if os.path.exists(next_archive_path) == False:
                     command = ""
                     if archive_path.suffix == '.zst':
-                        command = [str(zstd_exe), "--output-dir-flat", str(exe_install_dir), "-d", str(archive_path)]
-                        lprint(f'- zstd unzip {label} to: {exe_install_dir}', level=1)
+                        command = [str(zstd_exe), "-d", "-f", str(archive_path)]
+                        lprint(f'- zstd unzip {label}', level=1)
+
+                        # zstd extracts to the same directory as the archive
+                        next_archive_path = pathlib.Path(download_dir, archive_without_suffix)
                     else:
                         if not is_windows:
                             linux_used_tar = True