Fix lint and CI issues

Author: benmcmorran

build/downloadAssets.js

@@ -49,7 +49,12 @@ for (const asset in config.assets) {
       // Extract to an "arduino-cli" directory.
       const extractDirectory = resolve(directory, "arduino-cli");
       mkdirSync(extractDirectory, { recursive: true });
-      run(`tar -xf ${destination} -C ${extractDirectory}`);
+      // tar on Linux doesn't understand zip files.
+      if (asset.endsWith(".zip") && process.platform === 'linux') {
+        run(`unzip ${destination} -d ${extractDirectory}`);
+      } else {
+        run(`tar -xf ${destination} -C ${extractDirectory}`);
+      }
 
       // Remove the downloaded archive. We don't need to ship it.
       rmSync(destination);

src/arduino/arduinoSettings.ts

@@ -1,17 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+import { chmod } from "fs/promises";
 import * as os from "os";
 import * as path from "path";
+import * as vscode from "vscode";
 import * as WinReg from "winreg";
-import * as vscode from 'vscode';
-import { chmod } from "fs/promises";
 import * as util from "../common/util";
 
 import { resolveArduinoPath } from "../common/platform";
 
-import { VscodeSettings } from "./vscodeSettings";
 import * as Logger from "../logger/logger";
+import { VscodeSettings } from "./vscodeSettings";
 
 export interface IArduinoSettings {
     arduinoPath: string;
@@ -50,6 +50,16 @@ export class ArduinoSettings implements IArduinoSettings {
 
     private _usingBundledArduinoCli: boolean = false;
 
+    private readonly bundledArduinoCliName: { [platform: string]: string } = {
+        "darwin-arm64": "arduino-cli.app",
+        "darwin-x64": "arduino-cli.app",
+        "linux-arm64": "arduino-cli.app",
+        "linux-armhf": "arduino-cli.app",
+        "linux-x64": "arduino-cli.app",
+        "win32-ia32": "arduino-cli.exe",
+        "win32-x64": "arduino-cli.exe",
+    };
+
     public constructor(private readonly _context: vscode.ExtensionContext) {
     }
 
@@ -235,21 +245,13 @@ export class ArduinoSettings implements IArduinoSettings {
         }
     }
 
-    private readonly bundledArduinoCliName: { [platform: string]: string } = {
-        'darwin-arm64': 'arduino-cli.app',
-        'darwin-x64': 'arduino-cli.app',
-        'linux-arm64': 'arduino-cli.app',
-        'linux-armhf': 'arduino-cli.app',
-        'linux-x64': 'arduino-cli.app',
-        'win32-ia32': 'arduino-cli.exe',
-        'win32-x64': 'arduino-cli.exe',
-    };
-
     private async bundledArduinoCliPath(): Promise<string | undefined> {
         const platform = await util.getPlatform();
         const name = this.bundledArduinoCliName[platform];
-        if (!name) return undefined;
-        return this._context.asAbsolutePath(path.join('assets', 'platform', platform, 'arduino-cli', name));
+        if (!name) {
+            return undefined;
+        }
+        return this._context.asAbsolutePath(path.join("assets", "platform", platform, "arduino-cli", name));
     }
 
     private async tryResolveArduinoPath(): Promise<void> {

src/arduinoActivator.ts

@@ -15,8 +15,8 @@ import ArduinoContext from "./arduinoContext";
 import { DeviceContext } from "./deviceContext";
 
 class ArduinoActivator {
-    private _initializePromise: Promise<void>;
     public context: vscode.ExtensionContext;
+    private _initializePromise: Promise<void>;
     public async activate() {
         if (this._initializePromise) {
             await this._initializePromise;

src/common/util.ts

@@ -472,6 +472,7 @@ export function toStringArray(value: string | string[]): string[] {
 // Ideally VS Code would provide an API to get the target platform name. For
 // now, copy the logic from VS Code.
 // https://github.com/microsoft/vscode/issues/170196
+// tslint:disable-next-line
 // https://github.com/microsoft/vscode/blob/78d05ca56a6881e7503a5173131c9803b059012d/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts#L171-L196
 export async function getPlatform(): Promise<string> {
     let platform: string = process.platform;
@@ -490,8 +491,9 @@ export async function getPlatform(): Promise<string> {
             !!content &&
             // eslint-disable-next-line no-control-regex
             (content.match(/^ID=([^\u001b\r\n]*)/m) || [])[1] === "alpine"
-        )
+        ) {
             platform = "alpine";
+        }
     }
     return `${platform}-${process.arch}`;
-}
+}

src/extension.ts

@@ -90,8 +90,8 @@ export async function activate(context: vscode.ExtensionContext) {
                     await vscodeSettings.setArduinoPath(undefined);
                     await vscodeSettings.setCommandPath(undefined);
                     await vscode.commands.executeCommand("workbench.action.reloadWindow");
+                    break;
                 }
-                break;
             case "View settings":
                 await vscode.commands.executeCommand("workbench.action.openGlobalSettings");
                 break;