Skip to content

Commit 7f7eeeb

Browse files
committed
Fix rebase issue
Signed-off-by: paulober <[email protected]>
1 parent 48d55a8 commit 7f7eeeb

File tree

2 files changed

+130
-359
lines changed

2 files changed

+130
-359
lines changed

src/utils/download.mts

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -258,25 +258,12 @@ export async function downloadAndInstallArchive(
258258
if (!archiveExtension) {
259259
Logger.error(
260260
LoggerSource.downloader,
261-
`Could not determine archive extension for ${url}`
261+
`Could not determine archive extension for ${archiveFileName}`
262262
);
263263

264264
return false;
265265
}
266266

267-
// TODO: find and eliminate issue why this is necesarry
268-
if (archiveExtension.length > 6) {
269-
archiveExtension = getArchiveExtension(archiveFileName);
270-
if (!archiveExtension) {
271-
Logger.error(
272-
LoggerSource.downloader,
273-
`Could not determine archive extension for ${archiveFileName}`
274-
);
275-
276-
return false;
277-
}
278-
}
279-
280267
const tmpBasePath = join(tmpdir(), "pico-sdk");
281268
await mkdir(tmpBasePath, { recursive: true });
282269
const archiveFilePath = join(tmpBasePath, archiveFileName);
@@ -538,15 +525,14 @@ export async function downloadAndInstallSDK(
538525
);
539526
// Constants taken from the SDK CMakeLists.txt files
540527
const TINYUSB_TEST_PATH = joinPosix(
541-
"lib/tinyusb", "src/portable/raspberrypi/rp2040"
528+
"lib/tinyusb",
529+
"src/portable/raspberrypi/rp2040"
542530
);
543531
const CYW43_DRIVER_TEST_FILE = joinPosix("lib/cyw43-driver", "src/cyw43.h");
544532
const LWIP_TEST_PATH = joinPosix("lib/lwip", "src/Filelists.cmake");
545533
const BTSTACK_TEST_PATH = joinPosix("lib/btstack", "src/bluetooth.h");
546-
const MBEDTLS_TEST_PATH = joinPosix("lib/mbedtls", "library/aes.c")
547-
const submoduleChecks = [
548-
TINYUSB_TEST_PATH
549-
]
534+
const MBEDTLS_TEST_PATH = joinPosix("lib/mbedtls", "library/aes.c");
535+
const submoduleChecks = [TINYUSB_TEST_PATH];
550536
if (compareGe(version, "1.4.0")) {
551537
submoduleChecks.push(CYW43_DRIVER_TEST_FILE);
552538
submoduleChecks.push(LWIP_TEST_PATH);

0 commit comments

Comments
 (0)