Fix CLI invocation during install on some Windows systems

CircuitMess · Sep 24, 2020 · d4434b4 · d4434b4
1 parent 94d7423
commit d4434b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/core/compiler/cli.ts b/core/compiler/cli.ts
@@ -4,16 +4,22 @@ import * as child_process from "child_process";
 
 export class CLI {
 
-	public static run(args?: string[], info?: InstallInfo){
+	public static run(args?: string[], info?: InstallInfo | string){
+		let path: string;
+
 		if(info == undefined){
 			info = ArduinoCompiler.checkInstall();
 			if(info == null) return;
+		}else if(typeof info == "string"){
+			path = info;
+		}else{
+			path = info.cli;
 		}
 
 		const command = os.type() == "Windows_NT"
 			? "arduino-cli.exe"
 			: "./arduino-cli";
 
-		return child_process.execFileSync(command, args, { encoding: "utf8", cwd: info.cli });
+		return child_process.execFileSync(command, args, { encoding: "utf8", cwd: path });
 	}
 }
diff --git a/core/compiler/installer.ts b/core/compiler/installer.ts
@@ -138,9 +138,9 @@ export default class Installer {
 
   private cliInit(path, callback: (error) => void) {
       try{
-        CLI.run(['config', 'init']);
-        CLI.run(['core', 'update-index']);
-        CLI.run(['lib', 'update-index']);
+        CLI.run(['config', 'init'], path);
+        CLI.run(['core', 'update-index'], path);
+        CLI.run(['lib', 'update-index'], path);
       }catch(e){
           logger.log("CLI init error", e);
           callback(e);