wip

Signed-off-by: Jens Reinecke <[email protected]>

Author: jreineckearm

scripts/download-tools.ts

@@ -237,8 +237,7 @@ async function downloadGDB(target: VsceTarget, dest: string, options?: ToolOptio
         'darwin-arm64': { build: 'darwin-arm64', ext: 'tar.xz'},
     }[target];
 
-    const asset_name_base = `arm-gnu-toolchain-${build}-arm-none-eabi-gdb`;
-    const asset_name = `${asset_name_base}.${ext}`;
+    const asset_name = `arm-gnu-toolchain-${build}-arm-none-eabi-gdb.${ext}`;
     const url = `https://artifacts.tools.arm.com/arm-none-eabi-gdb/${jsonVersion}/${asset_name}`;
 
     const tempfile = await import('tempfile');
@@ -247,7 +246,6 @@ async function downloadGDB(target: VsceTarget, dest: string, options?: ToolOptio
         ? { mode: 'cache', downloadPath: options.cache }
         : { mode: 'temp', downloadPath: tempfile.default() };
     const downloadFilePath = path.join(downloadPath, asset_name);
-    //const downloadFilePathBase = path.join(downloadPath, asset_name_base);
 
     if (options?.force === false && mode === 'cache' && existsSync(downloadFilePath)) {
         console.debug(`Found GDB asset in cache ${downloadFilePath} ...`);
@@ -270,23 +268,21 @@ async function downloadGDB(target: VsceTarget, dest: string, options?: ToolOptio
     const fileType  = await fileTypeFromFile(downloadFilePath);
     console.debug(`File type: MIME-type ${fileType?.mime}, Extension ${fileType?.ext} ...`);
 
-    //if (fileType?.mime === 'application/zip' || fileType?.ext === 'zip') {
+    if (fileType?.mime === 'application/zip' || fileType?.ext === 'zip') {
         console.debug(`extractZip: dir ${destPath} ...`);
         await extractZip(downloadFilePath, { dir: destPath, onEntry(entry, _zipfile) {
             console.debug(`\tentry ${entry.fileName} ...`);
         }, }).catch(error => {
             throw new Error(`Failed to extract ${url}`, { cause: error });
         });
-        /*
     } else {
         console.debug(`fastExtract: downld ${downloadFilePath}, dest ${destPath} ...`);
-        await fastExtract(downloadFilePathBase, destPath, { strip: 1, type: fileType?.ext },
+        await fastExtract(downloadFilePath, destPath, { strip: 1, type: 'tgz' },
 
         ).catch(error => {
             throw new Error(`Failed to extract ${downloadFilePath}`, { cause: error });
         });
     }
-        */
 
 
     // Remove doc directory as it contains duplicate files (names differ only in case)