jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-24 11:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplified code when deceding which CLI to use.

Browse Source 
Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2019-11-22 10:33:37 +01:00
parent 35ac73181b
commit 63cd2701b4
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arduino-ide-extension/src/node/arduino-cli.ts
View File

@ -26,30 +26,15 @@ export class ArduinoCli {
const buildVersion = await this.spawn(`"${buildCli}"`, ['version']);
const buildShortVersion = (buildVersion.match(version) || [])[0];
this.execPath = buildCli;
try {
const pathCli = await new Promise<string>((resolve, reject) => {
which(cli, (error, path) => {
if (error) {
reject(error);
return;
}
resolve(path);
});
});
if (!pathCli) {
return buildCli;
}
const pathVersion = await this.spawn(`"${pathCli}"`, ['version']);
const pathShortVersion = (pathVersion.match(version) || [])[0];
if (semver.gt(pathShortVersion, buildShortVersion)) {
this.execPath = pathCli;
return pathCli;
}
} catch (error) {
this.logger.warn(`Could not check for Arduino CLI in $PATH, using embedded CLI instead:`, error);
// Any errors here should be safe to ignore, e.g.:
// - Could not search for CLI in $PATH
// - Could not get version of CLI in $PATH
const pathCli = await new Promise<string | undefined>(resolve => which(cli, (error, path) => resolve(error ? undefined : path)));
if (!pathCli) {
return buildCli;
}
const pathVersion = await this.spawn(`"${pathCli}"`, ['version']);
const pathShortVersion = (pathVersion.match(version) || [])[0];
if (semver.gt(pathShortVersion, buildShortVersion)) {
this.execPath = pathCli;
return pathCli;
}
return buildCli;
}