xs-dev 0.30.3 → 0.30.4
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.
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ensureHomebrew = void 0;
|
|
6
|
+
exports.formulaeExists = exports.ensureHomebrew = void 0;
|
|
7
7
|
const os_1 = __importDefault(require("os"));
|
|
8
8
|
const gluegun_1 = require("gluegun");
|
|
9
9
|
const upsert_1 = __importDefault(require("../patching/upsert"));
|
|
@@ -45,4 +45,13 @@ async function ensureHomebrew() {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
exports.ensureHomebrew = ensureHomebrew;
|
|
48
|
-
|
|
48
|
+
async function formulaeExists(formulae) {
|
|
49
|
+
if (gluegun_1.system.which('brew') === null)
|
|
50
|
+
return false;
|
|
51
|
+
const result = await gluegun_1.system.spawn(`brew list ${formulae}`, {
|
|
52
|
+
shell: process.env.SHELL,
|
|
53
|
+
});
|
|
54
|
+
return result.status === 0;
|
|
55
|
+
}
|
|
56
|
+
exports.formulaeExists = formulaeExists;
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZWJyZXcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9ob21lYnJldy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw0Q0FBbUI7QUFDbkIscUNBQTJEO0FBQzNELGdFQUF1QztBQUN2QywyQ0FBNEM7QUFFNUMsU0FBUyxXQUFXO0lBQ2xCLElBQUksWUFBRSxDQUFDLElBQUksRUFBRSxLQUFLLE9BQU87UUFBRSxPQUFPLG1CQUFtQixDQUFBO0lBQ3JELE9BQU8sZ0JBQWdCLENBQUE7QUFDekIsQ0FBQztBQUVNLEtBQUssVUFBVSxjQUFjO0lBQ2xDLElBQUksZ0JBQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxFQUFFO1FBQ2pDLE1BQU0sUUFBUSxHQUFHLFdBQVcsRUFBRSxDQUFBO1FBQzlCLE1BQU0sWUFBWSxHQUFHLFdBQVcsUUFBUSxrQkFBa0IsQ0FBQTtRQUUxRCxJQUFJLG9CQUFVLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEtBQUssRUFBRTtZQUN6QyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksR0FBRyxHQUFHLFFBQVEsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFBO1lBQzVELE9BQU07U0FDUDtRQUVELE1BQU0saUJBQWlCLEdBQUcsTUFBTSxnQkFBTSxDQUFDLE9BQU8sQ0FDNUMsOElBQThJLENBQy9JLENBQUE7UUFFRCxJQUFJLGlCQUFpQixFQUFFO1lBQ3JCLElBQUk7Z0JBQ0YsZUFBSyxDQUFDLElBQUksQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFBO2dCQUNoRCxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUNmLGlHQUFpRyxFQUNqRztvQkFDRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLO29CQUN4QixNQUFNLEVBQUUsT0FBTyxDQUFDLE1BQU07b0JBQ3RCLEtBQUssRUFBRSxPQUFPLENBQUMsS0FBSztpQkFDckIsQ0FDRixDQUFBO2dCQUNELE1BQU0sWUFBWSxHQUFHLElBQUEsMEJBQWMsR0FBRSxDQUFBO2dCQUNyQyxNQUFNLElBQUEsZ0JBQU0sRUFBQyxZQUFZLEVBQUUsWUFBWSxDQUFDLENBQUE7Z0JBQ3hDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxHQUFHLEdBQUcsUUFBUSxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUE7Z0JBQzVELE9BQU07YUFDUDtZQUFDLE9BQU8sS0FBYyxFQUFFO2dCQUN2QixJQUFJLEtBQUssWUFBWSxLQUFLLEVBQUU7b0JBQzFCLGVBQUssQ0FBQyxLQUFLLENBQUMsK0JBQStCLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO2lCQUM1RDthQUNGO1NBQ0Y7UUFFRCxNQUFNLElBQUksS0FBSyxDQUNiLHNMQUFzTCxDQUN2TCxDQUFBO0tBQ0Y7QUFDSCxDQUFDO0FBeENELHdDQXdDQztBQVFNLEtBQUssVUFBVSxjQUFjLENBQUMsUUFBZ0I7SUFDbkQsSUFBSSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxJQUFJO1FBQUUsT0FBTyxLQUFLLENBQUE7SUFFL0MsTUFBTSxNQUFNLEdBQWdCLE1BQU0sZ0JBQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxRQUFRLEVBQUUsRUFBRTtRQUN0RSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLO0tBQ3pCLENBQUMsQ0FBQTtJQUNGLE9BQU8sTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUE7QUFDNUIsQ0FBQztBQVBELHdDQU9DIn0=
|
|
@@ -13,7 +13,8 @@ async function installDeps(spinner) {
|
|
|
13
13
|
process.exit(1);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
-
if (gluegun_1.system.which('arm-none-eabi-gcc') !== null
|
|
16
|
+
if (gluegun_1.system.which('arm-none-eabi-gcc') !== null &&
|
|
17
|
+
(await (0, homebrew_1.formulaeExists)('arm-none-eabi-gcc'))) {
|
|
17
18
|
spinner.start('Removing outdated arm gcc dependency');
|
|
18
19
|
await gluegun_1.system.exec('brew untap ArmMbed/homebrew-formulae');
|
|
19
20
|
await gluegun_1.system.exec('brew uninstall arm-none-eabi-gcc');
|
|
@@ -29,4 +30,4 @@ async function installDeps(spinner) {
|
|
|
29
30
|
spinner.succeed();
|
|
30
31
|
}
|
|
31
32
|
exports.installDeps = installDeps;
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvcGljby9tYWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUNBQXFEO0FBQ3JELDBDQUE0RDtBQUVyRCxLQUFLLFVBQVUsV0FBVyxDQUMvQixPQUF5QztJQUV6QyxJQUFJO1FBQ0YsTUFBTSxJQUFBLHlCQUFjLEdBQUUsQ0FBQTtLQUN2QjtJQUFDLE9BQU8sS0FBYyxFQUFFO1FBQ3ZCLElBQUksS0FBSyxZQUFZLEtBQUssRUFBRTtZQUMxQixlQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLE9BQU8sdUNBQXVDLENBQUMsQ0FBQTtZQUNuRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1NBQ2hCO0tBQ0Y7SUFFRCxJQUNFLGdCQUFNLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQUssSUFBSTtRQUMxQyxDQUFDLE1BQU0sSUFBQSx5QkFBYyxFQUFDLG1CQUFtQixDQUFDLENBQUMsRUFDM0M7UUFDQSxPQUFPLENBQUMsS0FBSyxDQUFDLHNDQUFzQyxDQUFDLENBQUE7UUFDckQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFBO1FBQ3pELE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtRQUNyRCxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7S0FDbEI7SUFFRCxPQUFPLENBQUMsS0FBSyxDQUFDLG9DQUFvQyxDQUFDLENBQUE7SUFDbkQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxnQ0FBZ0MsRUFBRTtRQUNsRCxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLO0tBQ3pCLENBQUMsQ0FBQTtJQUNGLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsc0NBQXNDLEVBQUU7UUFDeEQsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSztLQUN6QixDQUFDLENBQUE7SUFDRixPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7QUFDbkIsQ0FBQztBQTlCRCxrQ0E4QkMifQ==
|