Skip to content

Commit 3c5947d

Browse files
committed
Fix rebase issue
Signed-off-by: paulober <[email protected]>
1 parent 6baed66 commit 3c5947d

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
@@ -262,25 +262,12 @@ export async function downloadAndInstallArchive(
262262
if (!archiveExtension) {
263263
Logger.error(
264264
LoggerSource.downloader,
265-
`Could not determine archive extension for ${url}`
265+
`Could not determine archive extension for ${archiveFileName}`
266266
);
267267

268268
return false;
269269
}
270270

271-
// TODO: find and eliminate issue why this is necesarry
272-
if (archiveExtension.length > 6) {
273-
archiveExtension = getArchiveExtension(archiveFileName);
274-
if (!archiveExtension) {
275-
Logger.error(
276-
LoggerSource.downloader,
277-
`Could not determine archive extension for ${archiveFileName}`
278-
);
279-
280-
return false;
281-
}
282-
}
283-
284271
const tmpBasePath = join(tmpdir(), "pico-sdk");
285272
await mkdir(tmpBasePath, { recursive: true });
286273
const archiveFilePath = join(tmpBasePath, archiveFileName);
@@ -542,15 +529,14 @@ export async function downloadAndInstallSDK(
542529
);
543530
// Constants taken from the SDK CMakeLists.txt files
544531
const TINYUSB_TEST_PATH = joinPosix(
545-
"lib/tinyusb", "src/portable/raspberrypi/rp2040"
532+
"lib/tinyusb",
533+
"src/portable/raspberrypi/rp2040"
546534
);
547535
const CYW43_DRIVER_TEST_FILE = joinPosix("lib/cyw43-driver", "src/cyw43.h");
548536
const LWIP_TEST_PATH = joinPosix("lib/lwip", "src/Filelists.cmake");
549537
const BTSTACK_TEST_PATH = joinPosix("lib/btstack", "src/bluetooth.h");
550-
const MBEDTLS_TEST_PATH = joinPosix("lib/mbedtls", "library/aes.c")
551-
const submoduleChecks = [
552-
TINYUSB_TEST_PATH
553-
]
538+
const MBEDTLS_TEST_PATH = joinPosix("lib/mbedtls", "library/aes.c");
539+
const submoduleChecks = [TINYUSB_TEST_PATH];
554540
if (compareGe(version, "1.4.0")) {
555541
submoduleChecks.push(CYW43_DRIVER_TEST_FILE);
556542
submoduleChecks.push(LWIP_TEST_PATH);

0 commit comments

Comments
 (0)