xs-dev 0.32.1 → 0.32.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/build/commands/scan.js
CHANGED
|
@@ -14,16 +14,22 @@ const command = {
|
|
|
14
14
|
name: 'scan',
|
|
15
15
|
description: 'Look for available devices',
|
|
16
16
|
run: async (toolbox) => {
|
|
17
|
-
const { parameters, print, system } = toolbox;
|
|
17
|
+
const { filesystem, parameters, print, system } = toolbox;
|
|
18
18
|
if (parameters.options.help !== undefined) {
|
|
19
19
|
print.printCommands(toolbox, ['scan']);
|
|
20
20
|
process.exit(0);
|
|
21
21
|
}
|
|
22
|
+
const spinner = print.spin();
|
|
22
23
|
await (0, exec_1.sourceEnvironment)();
|
|
24
|
+
if (typeof process.env.IDF_PATH === 'string' &&
|
|
25
|
+
filesystem.exists(process.env.IDF_PATH) === 'dir') {
|
|
26
|
+
spinner.start(`Found ESP_IDF, sourcing environment...`);
|
|
27
|
+
await (0, exec_1.sourceIdf)();
|
|
28
|
+
spinner.stop();
|
|
29
|
+
}
|
|
23
30
|
if (system.which('esptool.py') === null) {
|
|
24
31
|
print.warning('esptool.py required to scan for Espressif devices. Setup environment for ESP8266 or ESP32:\n xs-dev setup --device esp32\n xs-dev setup --device esp8266.');
|
|
25
32
|
}
|
|
26
|
-
const spinner = print.spin();
|
|
27
33
|
spinner.start('Scanning for devices...');
|
|
28
34
|
const hasPicotool = system.which('picotool') !== null;
|
|
29
35
|
if (hasPicotool) {
|
|
@@ -70,4 +76,4 @@ const command = {
|
|
|
70
76
|
},
|
|
71
77
|
};
|
|
72
78
|
exports.default = command;
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Nhbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tYW5kcy9zY2FuLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkNBQXVDO0FBQ3ZDLDZCQUF3QztBQUd4QyxpREFBdUQ7QUFDdkQsaURBQXFFO0FBRXJFLDJCQUEyQjtBQUMzQixTQUFTLEtBQUssQ0FBQyxPQUFlO0lBQzVCLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtRQUM3QixVQUFVLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzlCLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQUVELE1BQU0sT0FBTyxHQUFpQztJQUM1QyxJQUFJLEVBQUUsTUFBTTtJQUNaLFdBQVcsRUFBRSw0QkFBNEI7SUFDekMsR0FBRyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUNyQixNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFBO1FBQ3pELElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEtBQUssU0FBUyxFQUFFO1lBQ3pDLEtBQUssQ0FBQyxhQUFhLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtZQUN0QyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1NBQ2hCO1FBRUQsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFBO1FBRTVCLE1BQU0sSUFBQSx3QkFBaUIsR0FBRSxDQUFBO1FBRXpCLElBQ0UsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsS0FBSyxRQUFRO1lBQ3hDLFVBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxLQUFLLEVBQ2pEO1lBQ0EsT0FBTyxDQUFDLEtBQUssQ0FBQyx3Q0FBd0MsQ0FBQyxDQUFBO1lB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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sourceEnvironment = exports.execWithSudo = void 0;
|
|
3
|
+
exports.sourceIdf = exports.sourceEnvironment = exports.execWithSudo = void 0;
|
|
4
4
|
const node_os_1 = require("node:os");
|
|
5
5
|
const gluegun_1 = require("gluegun");
|
|
6
6
|
const constants_1 = require("../setup/constants");
|
|
@@ -58,4 +58,30 @@ async function sourceEnvironment() {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
exports.sourceEnvironment = sourceEnvironment;
|
|
61
|
-
|
|
61
|
+
/**
|
|
62
|
+
* Set updated env from user shell as process.env
|
|
63
|
+
*/
|
|
64
|
+
async function sourceIdf() {
|
|
65
|
+
const OS = (0, node_os_1.type)().toLowerCase();
|
|
66
|
+
if (OS !== 'windows_nt') {
|
|
67
|
+
try {
|
|
68
|
+
const result = await gluegun_1.system.spawn(`source $IDF_PATH/export.sh 1> /dev/null && env`, {
|
|
69
|
+
shell: process.env.SHELL,
|
|
70
|
+
});
|
|
71
|
+
if (typeof result.stdout === 'string' ||
|
|
72
|
+
result.stdout instanceof Buffer) {
|
|
73
|
+
const localEnv = Object.fromEntries(result.stdout
|
|
74
|
+
.toString()
|
|
75
|
+
.split('\n')
|
|
76
|
+
.map((field) => field === null || field === void 0 ? void 0 : field.split('=')));
|
|
77
|
+
if ('PATH' in localEnv)
|
|
78
|
+
process.env = localEnv;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
console.warn('Unable to source the ESP IDF settings:', error);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
exports.sourceIdf = sourceIdf;
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90b29sYm94L3N5c3RlbS9leGVjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFDQUE4QztBQUM5QyxxQ0FBdUM7QUFDdkMsa0RBQXNEO0FBR3RELFNBQVMsYUFBYTtJQUNwQixNQUFNLFlBQVksR0FBRyxnQkFBTSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUNoRCxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUU7UUFDOUIsZUFBSyxDQUFDLE9BQU8sQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFBO1FBQzVELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7S0FDaEI7SUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksR0FBRyxZQUFZLENBQUE7QUFDekMsQ0FBQztBQUVEOzs7SUFHSTtBQUNHLEtBQUssVUFBVSxZQUFZLENBQ2hDLE9BQWUsRUFDZixVQUFtQyxFQUFFO0lBRXJDLElBQUk7UUFDRixNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUNmLHlDQUF5QyxPQUFPLEVBQUUsRUFDbEQsT0FBTyxDQUNSLENBQUE7UUFDRCxPQUFNO0tBQ1A7SUFBQyxPQUFPLEtBQUssRUFBRTtRQUNkLElBQUksS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxLQUFLLEVBQUU7WUFDbkQsYUFBYSxFQUFFLENBQUE7U0FDaEI7YUFBTTtZQUNMLE1BQU0sS0FBSyxDQUFBO1NBQ1o7S0FDRjtJQUVELE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsaUNBQWlDLE9BQU8sRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0FBQ3hFLENBQUM7QUFuQkQsb0NBbUJDO0FBRUQ7O0dBRUc7QUFDSSxLQUFLLFVBQVUsaUJBQWlCO0lBQ3JDLE1BQU0sRUFBRSxHQUFHLElBQUEsY0FBWSxHQUFFLENBQUMsV0FBVyxFQUFZLENBQUE7SUFFakQsSUFBSSxFQUFFLEtBQUssWUFBWSxFQUFFO1FBQ3ZCLElBQUk7WUFDRixNQUFNLE1BQU0sR0FBRyxNQUFNLGdCQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsNkJBQWlCLFNBQVMsRUFBRTtnQkFDdEUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSzthQUN6QixDQUFDLENBQUE7WUFDRixJQUNFLE9BQU8sTUFBTSxDQUFDLE1BQU0sS0FBSyxRQUFRO2dCQUNqQyxNQUFNLENBQUMsTUFBTSxZQUFZLE1BQU0sRUFDL0I7Z0JBQ0EsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FDakMsTUFBTSxDQUFDLE1BQU07cUJBQ1YsUUFBUSxFQUFFO3FCQUNWLEtBQUssQ0FBQyxJQUFJLENBQUM7cUJBQ1gsR0FBRyxDQUFDLENBQUMsS0FBYSxFQUFFLEVBQUUsQ0FBQyxLQUFLLGFBQUwsS0FBSyx1QkFBTCxLQUFLLENBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQzdDLENBQUE7Z0JBQ0QsSUFBSSxNQUFNLElBQUksUUFBUTtvQkFBRSxPQUFPLENBQUMsR0FBRyxHQUFHLFFBQVEsQ0FBQTthQUMvQztTQUNGO1FBQUMsT0FBTyxLQUFLLEVBQUU7WUFDZCxPQUFPLENBQUMsSUFBSSxDQUFDLDRDQUE0QyxFQUFFLEtBQUssQ0FBQyxDQUFBO1NBQ2xFO0tBQ0Y7QUFDSCxDQUFDO0FBeEJELDhDQXdCQztBQUVEOztHQUVHO0FBQ0ksS0FBSyxVQUFVLFNBQVM7SUFDN0IsTUFBTSxFQUFFLEdBQUcsSUFBQSxjQUFZLEdBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQTtJQUVqRCxJQUFJLEVBQUUsS0FBSyxZQUFZLEVBQUU7UUFDdkIsSUFBSTtZQUNGLE1BQU0sTUFBTSxHQUFHLE1BQU0sZ0JBQU0sQ0FBQyxLQUFLLENBQy9CLGdEQUFnRCxFQUNoRDtnQkFDRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLO2FBQ3pCLENBQ0YsQ0FBQTtZQUNELElBQ0UsT0FBTyxNQUFNLENBQUMsTUFBTSxLQUFLLFFBQVE7Z0JBQ2pDLE1BQU0sQ0FBQyxNQUFNLFlBQVksTUFBTSxFQUMvQjtnQkFDQSxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUNqQyxNQUFNLENBQUMsTUFBTTtxQkFDVixRQUFRLEVBQUU7cUJBQ1YsS0FBSyxDQUFDLElBQUksQ0FBQztxQkFDWCxHQUFHLENBQUMsQ0FBQyxLQUFhLEVBQUUsRUFBRSxDQUFDLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FDN0MsQ0FBQTtnQkFDRCxJQUFJLE1BQU0sSUFBSSxRQUFRO29CQUFFLE9BQU8sQ0FBQyxHQUFHLEdBQUcsUUFBUSxDQUFBO2FBQy9DO1NBQ0Y7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNkLE9BQU8sQ0FBQyxJQUFJLENBQUMsd0NBQXdDLEVBQUUsS0FBSyxDQUFDLENBQUE7U0FDOUQ7S0FDRjtBQUNILENBQUM7QUEzQkQsOEJBMkJDIn0=
|
|
@@ -7,3 +7,7 @@ export declare function execWithSudo(command: string, options?: Record<string, u
|
|
|
7
7
|
* Set updated env from user shell as process.env
|
|
8
8
|
*/
|
|
9
9
|
export declare function sourceEnvironment(): Promise<void>;
|
|
10
|
+
/**
|
|
11
|
+
* Set updated env from user shell as process.env
|
|
12
|
+
*/
|
|
13
|
+
export declare function sourceIdf(): Promise<void>;
|