balena-cli 23.2.21 → 23.2.22
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/CHANGELOG.md +5 -0
- package/build/app.d.ts +0 -1
- package/build/app.js +4 -8
- package/build/app.js.map +1 -1
- package/build/commands/config/write.d.ts +1 -1
- package/build/commands/config/write.js +3 -3
- package/build/commands/config/write.js.map +1 -1
- package/build/commands/deploy/index.js +1 -1
- package/build/commands/deploy/index.js.map +1 -1
- package/build/commands/device/ssh.js +1 -1
- package/build/commands/device/ssh.js.map +1 -1
- package/build/deprecation.d.ts +1 -1
- package/build/deprecation.js +3 -3
- package/build/deprecation.js.map +1 -1
- package/build/help.d.ts +1 -1
- package/build/help.js +3 -3
- package/build/help.js.map +1 -1
- package/build/preparser.d.ts +1 -1
- package/build/preparser.js +2 -2
- package/build/preparser.js.map +1 -1
- package/build/utils/compose.d.ts +1 -1
- package/build/utils/compose_ts.js +4 -4
- package/build/utils/compose_ts.js.map +1 -1
- package/build/utils/deploy-legacy.js +11 -12
- package/build/utils/deploy-legacy.js.map +1 -1
- package/build/utils/helpers.d.ts +2 -2
- package/build/utils/helpers.js +6 -6
- package/build/utils/helpers.js.map +1 -1
- package/build/utils/qemu.js +3 -6
- package/build/utils/qemu.js.map +1 -1
- package/build/utils/streams.js.map +1 -1
- package/build/utils/sudo.js +1 -1
- package/build/utils/sudo.js.map +1 -1
- package/build/utils/umount.js +1 -1
- package/build/utils/umount.js.map +1 -1
- package/build/utils/which.d.ts +1 -1
- package/build/utils/which.js +2 -2
- package/build/utils/which.js.map +1 -1
- package/npm-shrinkwrap.json +4 -2
- package/oclif.manifest.json +455 -455
- package/package.json +2 -2
- package/src/app.ts +4 -14
- package/src/commands/config/write.ts +7 -3
- package/src/commands/deploy/index.ts +1 -1
- package/src/commands/device/ssh.ts +1 -1
- package/src/deprecation.ts +3 -4
- package/src/help.ts +5 -4
- package/src/preparser.ts +2 -2
- package/src/utils/compose.ts +1 -1
- package/src/utils/compose_ts.ts +8 -4
- package/src/utils/deploy-legacy.ts +20 -19
- package/src/utils/helpers.ts +9 -7
- package/src/utils/qemu.ts +3 -7
- package/src/utils/streams.ts +1 -1
- package/src/utils/sudo.ts +1 -1
- package/src/utils/umount.ts +1 -1
- package/src/utils/which.ts +2 -2
|
@@ -3,18 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.deployLegacy = void 0;
|
|
4
4
|
const lazy_1 = require("./lazy");
|
|
5
5
|
const util_1 = require("util");
|
|
6
|
-
const getBuilderPushEndpoint = function (baseUrl, owner, app) {
|
|
7
|
-
const querystring = require('querystring');
|
|
6
|
+
const getBuilderPushEndpoint = async function (baseUrl, owner, app) {
|
|
7
|
+
const querystring = await Promise.resolve().then(() => require('querystring'));
|
|
8
8
|
const args = querystring.stringify({ owner, app });
|
|
9
9
|
return `https://builder.${baseUrl}/v1/push?${args}`;
|
|
10
10
|
};
|
|
11
|
-
const getBuilderLogPushEndpoint = function (baseUrl, buildId, owner, app) {
|
|
12
|
-
const querystring = require('querystring');
|
|
11
|
+
const getBuilderLogPushEndpoint = async function (baseUrl, buildId, owner, app) {
|
|
12
|
+
const querystring = await Promise.resolve().then(() => require('querystring'));
|
|
13
13
|
const args = querystring.stringify({ owner, app, buildId });
|
|
14
14
|
return `https://builder.${baseUrl}/v1/pushLogs?${args}`;
|
|
15
15
|
};
|
|
16
|
-
const bufferImage = function (docker, imageId, bufferFile) {
|
|
17
|
-
const streamUtils = require('./streams');
|
|
16
|
+
const bufferImage = async function (docker, imageId, bufferFile) {
|
|
17
|
+
const streamUtils = await Promise.resolve().then(() => require('./streams'));
|
|
18
18
|
const image = docker.getImage(imageId);
|
|
19
19
|
const sizePromise = image.inspect().then((img) => img.Size);
|
|
20
20
|
return Promise.all([image.get(), sizePromise]).then(([imageStream, imageSize]) => streamUtils
|
|
@@ -73,7 +73,7 @@ const uploadImage = async function (imageStream, token, username, url, appName,
|
|
|
73
73
|
percentage: Math.min(percentage, 100),
|
|
74
74
|
eta,
|
|
75
75
|
})));
|
|
76
|
-
const uploadRequest = got.stream.post(getBuilderPushEndpoint(url, username, appName), {
|
|
76
|
+
const uploadRequest = got.stream.post(await getBuilderPushEndpoint(url, username, appName), {
|
|
77
77
|
headers: {
|
|
78
78
|
'Content-Encoding': 'gzip',
|
|
79
79
|
Authorization: `Bearer ${token}`,
|
|
@@ -87,7 +87,7 @@ const uploadImage = async function (imageStream, token, username, url, appName,
|
|
|
87
87
|
};
|
|
88
88
|
const uploadLogs = async function (logs, token, url, buildId, username, appName) {
|
|
89
89
|
const { default: got } = await Promise.resolve().then(() => require('got'));
|
|
90
|
-
return got.post(getBuilderLogPushEndpoint(url, buildId, username, appName), {
|
|
90
|
+
return got.post(await getBuilderLogPushEndpoint(url, buildId, username, appName), {
|
|
91
91
|
headers: {
|
|
92
92
|
Authorization: `Bearer ${token}`,
|
|
93
93
|
},
|
|
@@ -97,7 +97,8 @@ const uploadLogs = async function (logs, token, url, buildId, username, appName)
|
|
|
97
97
|
});
|
|
98
98
|
};
|
|
99
99
|
const deployLegacy = async function (docker, logger, token, username, url, opts) {
|
|
100
|
-
const tmp = require('tmp');
|
|
100
|
+
const tmp = await Promise.resolve().then(() => require('tmp'));
|
|
101
|
+
const { promises: fs } = await Promise.resolve().then(() => require('fs'));
|
|
101
102
|
const tmpNameAsync = (0, util_1.promisify)(tmp.tmpName);
|
|
102
103
|
tmp.setGracefulCleanup();
|
|
103
104
|
const { appName, imageName, buildLogs, shouldUploadLogs } = opts;
|
|
@@ -106,9 +107,7 @@ const deployLegacy = async function (docker, logger, token, username, url, opts)
|
|
|
106
107
|
logger.logInfo('Initializing deploy...');
|
|
107
108
|
const { buildId } = await bufferImage(docker, imageName, bufferFile)
|
|
108
109
|
.then((stream) => uploadImage(stream, token, username, url, appName, logger))
|
|
109
|
-
.finally(() =>
|
|
110
|
-
.unlink(bufferFile)
|
|
111
|
-
.catch(() => undefined));
|
|
110
|
+
.finally(() => fs.unlink(bufferFile).catch(() => undefined));
|
|
112
111
|
if (shouldUploadLogs) {
|
|
113
112
|
logger.logInfo('Uploading logs...');
|
|
114
113
|
const args = await Promise.all([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-legacy.js","sourceRoot":"","sources":["../../src/utils/deploy-legacy.ts"],"names":[],"mappings":";;;AAiBA,iCAAoC;AACpC,+BAAiC;AAKjC,MAAM,sBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"deploy-legacy.js","sourceRoot":"","sources":["../../src/utils/deploy-legacy.ts"],"names":[],"mappings":"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"}
|
package/build/utils/helpers.d.ts
CHANGED
|
@@ -48,7 +48,7 @@ export declare function retry<T>({ func, maxAttempts, label, initialDelayMs, bac
|
|
|
48
48
|
maxSingleDelayMs?: number;
|
|
49
49
|
}): Promise<T>;
|
|
50
50
|
export declare function isWindowsComExeShell(): boolean | undefined;
|
|
51
|
-
export declare function shellEscape(args: string[], detectShell?: boolean): string[]
|
|
51
|
+
export declare function shellEscape(args: string[], detectShell?: boolean): Promise<string[]>;
|
|
52
52
|
export interface ProxyConfig {
|
|
53
53
|
host: string;
|
|
54
54
|
port: string;
|
|
@@ -56,7 +56,7 @@ export interface ProxyConfig {
|
|
|
56
56
|
password?: string;
|
|
57
57
|
proxyAuth?: string;
|
|
58
58
|
}
|
|
59
|
-
export declare function getProxyConfig(): ProxyConfig | undefined
|
|
59
|
+
export declare function getProxyConfig(): Promise<ProxyConfig | undefined>;
|
|
60
60
|
export declare const expandForAppName: {
|
|
61
61
|
readonly $expand: {
|
|
62
62
|
readonly belongs_to__application: {
|
package/build/utils/helpers.js
CHANGED
|
@@ -46,14 +46,14 @@ async function sudo(command, { stderr, msg, isCLIcmd, } = {}) {
|
|
|
46
46
|
await executeWithPrivileges(command, stderr, isCLIcmd);
|
|
47
47
|
}
|
|
48
48
|
async function runCommand(commandArgs) {
|
|
49
|
-
const { isSubcommand } = require('../preparser');
|
|
49
|
+
const { isSubcommand } = await Promise.resolve().then(() => require('../preparser'));
|
|
50
50
|
if (await isSubcommand(commandArgs)) {
|
|
51
51
|
commandArgs = [
|
|
52
52
|
commandArgs[0] + ':' + commandArgs[1],
|
|
53
53
|
...commandArgs.slice(2),
|
|
54
54
|
];
|
|
55
55
|
}
|
|
56
|
-
const { run } = require('@oclif/core');
|
|
56
|
+
const { run } = await Promise.resolve().then(() => require('@oclif/core'));
|
|
57
57
|
return run(commandArgs);
|
|
58
58
|
}
|
|
59
59
|
async function getManifest(image, deviceType) {
|
|
@@ -176,7 +176,7 @@ function isWindowsComExeShell() {
|
|
|
176
176
|
return (process.env.SHELL == null &&
|
|
177
177
|
((_a = process.env.ComSpec) === null || _a === void 0 ? void 0 : _a.endsWith('cmd.exe')));
|
|
178
178
|
}
|
|
179
|
-
function shellEscape(args, detectShell = false) {
|
|
179
|
+
async function shellEscape(args, detectShell = false) {
|
|
180
180
|
const isCmdExe = detectShell
|
|
181
181
|
? isWindowsComExeShell()
|
|
182
182
|
: process.platform === 'win32';
|
|
@@ -184,7 +184,7 @@ function shellEscape(args, detectShell = false) {
|
|
|
184
184
|
return args.map((v) => windowsCmdExeEscapeArg(v));
|
|
185
185
|
}
|
|
186
186
|
else {
|
|
187
|
-
const shellEscapeFunc = require('shell-escape');
|
|
187
|
+
const shellEscapeFunc = await Promise.resolve().then(() => require('shell-escape'));
|
|
188
188
|
return args.map((v) => shellEscapeFunc([v]));
|
|
189
189
|
}
|
|
190
190
|
}
|
|
@@ -195,7 +195,7 @@ function windowsCmdExeEscapeArg(arg) {
|
|
|
195
195
|
arg = arg.replace(/[()%!^<>&|]/g, '^$&');
|
|
196
196
|
return `"${arg.replace(/["]/g, '""')}"`;
|
|
197
197
|
}
|
|
198
|
-
function getProxyConfig() {
|
|
198
|
+
async function getProxyConfig() {
|
|
199
199
|
const tunnelNgConfig = global.PROXY_CONFIG;
|
|
200
200
|
if (tunnelNgConfig) {
|
|
201
201
|
let username;
|
|
@@ -219,7 +219,7 @@ function getProxyConfig() {
|
|
|
219
219
|
else {
|
|
220
220
|
const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
|
|
221
221
|
if (proxyUrl) {
|
|
222
|
-
const { URL } = require('url');
|
|
222
|
+
const { URL } = await Promise.resolve().then(() => require('url'));
|
|
223
223
|
let url;
|
|
224
224
|
try {
|
|
225
225
|
url = new URL(proxyUrl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"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"}
|
package/build/utils/qemu.js
CHANGED
|
@@ -5,18 +5,17 @@ exports.qemuPathInContext = qemuPathInContext;
|
|
|
5
5
|
exports.copyQemu = copyQemu;
|
|
6
6
|
exports.installQemuIfNeeded = installQemuIfNeeded;
|
|
7
7
|
const errors_1 = require("../errors");
|
|
8
|
+
const path = require("path");
|
|
9
|
+
const fs = require("fs");
|
|
8
10
|
const lazy_1 = require("./lazy");
|
|
9
11
|
exports.QEMU_VERSION = 'v7.0.0+balena1';
|
|
10
12
|
exports.QEMU_BIN_NAME = 'qemu-execve';
|
|
11
13
|
function qemuPathInContext(context) {
|
|
12
|
-
const path = require('path');
|
|
13
14
|
const binDir = path.join(context, '.balena');
|
|
14
15
|
const binPath = path.join(binDir, exports.QEMU_BIN_NAME);
|
|
15
16
|
return path.relative(context, binPath);
|
|
16
17
|
}
|
|
17
18
|
function copyQemu(context, arch) {
|
|
18
|
-
const path = require('path');
|
|
19
|
-
const fs = require('fs');
|
|
20
19
|
const binDir = path.join(context, '.balena');
|
|
21
20
|
const binPath = path.join(binDir, exports.QEMU_BIN_NAME);
|
|
22
21
|
return fs.promises
|
|
@@ -43,9 +42,7 @@ function copyQemu(context, arch) {
|
|
|
43
42
|
const getQemuPath = function (balenaArch) {
|
|
44
43
|
const qemuArch = balenaArchToQemuArch(balenaArch);
|
|
45
44
|
const balena = (0, lazy_1.getBalenaSdk)();
|
|
46
|
-
|
|
47
|
-
const { promises: fs } = require('fs');
|
|
48
|
-
return balena.settings.get('binDirectory').then((binDir) => fs
|
|
45
|
+
return balena.settings.get('binDirectory').then((binDir) => fs.promises
|
|
49
46
|
.mkdir(binDir)
|
|
50
47
|
.catch(function (err) {
|
|
51
48
|
if (err.code === 'EEXIST') {
|
package/build/utils/qemu.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qemu.js","sourceRoot":"","sources":["../../src/utils/qemu.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"qemu.js","sourceRoot":"","sources":["../../src/utils/qemu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../src/utils/streams.ts"],"names":[],"mappings":";;AAkBA,wBAoBC;AAtBD,
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../src/utils/streams.ts"],"names":[],"mappings":";;AAkBA,wBAoBC;AAtBD,yBAAyB;AAEzB,SAAgB,MAAM,CACrB,MAA6B,EAC7B,UAAkB;IAElB,MAAM,eAAe,GAAG,EAAE,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEzD,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;QAC3C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC,IAAI,CACN,GAAG,EAAE,CACJ,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;QACpC,MAAM,OAAO,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAEhD,OAAO;aACL,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YAChB,OAAO,CAAC,OAAO,CAAC,CAAC;QAClB,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC,CACH,CAAC;AACH,CAAC"}
|
package/build/utils/sudo.js
CHANGED
|
@@ -18,7 +18,7 @@ async function executeWithPrivileges(command, stderr, isCLIcmd = true) {
|
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
20
|
opts.shell = true;
|
|
21
|
-
const escapedCmd = shellEscape(command);
|
|
21
|
+
const escapedCmd = await shellEscape(command);
|
|
22
22
|
if (process.platform === 'win32') {
|
|
23
23
|
await windosuExec(escapedCmd, stderr);
|
|
24
24
|
}
|
package/build/utils/sudo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sudo.js","sourceRoot":"","sources":["../../src/utils/sudo.ts"],"names":[],"mappings":";;AAsCA,sDA4BC;AAhDD,iDAAsC;AACtC,iCAAqC;AAmB9B,KAAK,UAAU,qBAAqB,CAC1C,OAAiB,EACjB,MAA8B,EAC9B,QAAQ,GAAG,IAAI;IAGf,MAAM,UAAU,GAAG,MAAM,CAAC,2CAAa,aAAa,EAAC,CAAC,EAAE,CAAC;IACzD,MAAM,EAAE,WAAW,EAAE,GAAG,2CAAa,WAAW,EAAC,CAAC;IAClD,MAAM,IAAI,GAAiB;QAC1B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;KAC1D,CAAC;IACF,IAAI,QAAQ,EAAE,CAAC;QACd,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QAEhB,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sudo.js","sourceRoot":"","sources":["../../src/utils/sudo.ts"],"names":[],"mappings":";;AAsCA,sDA4BC;AAhDD,iDAAsC;AACtC,iCAAqC;AAmB9B,KAAK,UAAU,qBAAqB,CAC1C,OAAiB,EACjB,MAA8B,EAC9B,QAAQ,GAAG,IAAI;IAGf,MAAM,UAAU,GAAG,MAAM,CAAC,2CAAa,aAAa,EAAC,CAAC,EAAE,CAAC;IACzD,MAAM,EAAE,WAAW,EAAE,GAAG,2CAAa,WAAW,EAAC,CAAC;IAClD,MAAM,IAAI,GAAiB;QAC1B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;KAC1D,CAAC;IACF,IAAI,QAAQ,EAAE,CAAC;QACd,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QAEhB,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;QAE9C,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAClC,MAAM,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACP,MAAM,YAAY,CAAC,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3D,CAAC;IACF,CAAC;AACF,CAAC;AAED,KAAK,UAAU,YAAY,CAC1B,iBAA2B,EAC3B,SAAuB,EACvB,MAA8B;IAE9B,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,EAAE,GAAiB,IAAA,qBAAK,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QAC1D,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvB,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,EAAE;YAC9B,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;gBACxB,MAAM,SAAS,GAAG,IAAI,cAAc,GAAG,CAAC;gBACxC,MAAM,CACL,IAAI,KAAK,CACR,yCAAyC,YAAY,mBAAmB,SAAS,EAAE,CACnF,CACD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACX,CAAC;QACF,CAAC,CAAC,CAAC;QACH,IAAI,MAAM,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACzB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CACnB,WAAqB,EACrB,MAA8B;IAE9B,IAAI,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,GAAG,IAAA,kBAAW,EAAA;;;GAGtB,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACvD,CAAC"}
|
package/build/utils/umount.js
CHANGED
|
@@ -13,7 +13,7 @@ async function umount(device) {
|
|
|
13
13
|
return;
|
|
14
14
|
}
|
|
15
15
|
const { sanitizePath, whichBin } = await Promise.resolve().then(() => require('./which'));
|
|
16
|
-
device = sanitizePath(device);
|
|
16
|
+
device = await sanitizePath(device);
|
|
17
17
|
const cmd = [];
|
|
18
18
|
if (process.platform === 'darwin') {
|
|
19
19
|
cmd.push('/usr/sbin/diskutil', 'unmountDisk', 'force', device);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"umount.js","sourceRoot":"","sources":["../../src/utils/umount.ts"],"names":[],"mappings":";;AAoCA,wBA4CC;AAMD,8BAyBC;AAGD,gCAOC;AAMD,8BAgBC;AApHD,+CAA+C;AAC/C,+BAAiC;AAEjC,MAAM,QAAQ,GAAG,IAAA,gBAAS,EAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;AAM5C,KAAK,UAAU,MAAM,CAAC,MAAc;;IAC1C,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAClC,OAAO;IACR,CAAC;IACD,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,2CAAa,SAAS,EAAC,CAAC;IAE3D,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"umount.js","sourceRoot":"","sources":["../../src/utils/umount.ts"],"names":[],"mappings":"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"}
|
package/build/utils/which.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const F_OK: number, R_OK: number, W_OK: number, X_OK: number;
|
|
2
2
|
export declare function exists(filename: string, mode?: number): Promise<boolean>;
|
|
3
|
-
export declare function sanitizePath(filepath: string): string
|
|
3
|
+
export declare function sanitizePath(filepath: string): Promise<string>;
|
|
4
4
|
export declare function whichBin(programName: string): Promise<string>;
|
|
5
5
|
export declare function which(program: string, rejectOnMissing?: boolean): Promise<string>;
|
package/build/utils/which.js
CHANGED
|
@@ -17,8 +17,8 @@ async function exists(filename, mode = exports.F_OK) {
|
|
|
17
17
|
return false;
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
function sanitizePath(filepath) {
|
|
21
|
-
const filenamify = require('filenamify');
|
|
20
|
+
async function sanitizePath(filepath) {
|
|
21
|
+
const filenamify = await Promise.resolve().then(() => require('filenamify'));
|
|
22
22
|
return path
|
|
23
23
|
.normalize(filepath)
|
|
24
24
|
.split(path.sep)
|
package/build/utils/which.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"which.js","sourceRoot":"","sources":["../../src/utils/which.ts"],"names":[],"mappings":";;;AAsBA,wBAOC;AAOD,oCAQC;AASD,4BAQC;AAaD,sBAsBC;AA/ED,2BAA+C;AAC/C,6BAA6B;AAEd,YAAI,GAAuB,cAAS,OAA9B,YAAI,GAAiB,cAAS,OAAxB,YAAI,GAAW,cAAS,OAAlB,YAAI,GAAK,cAAS,MAAC;AAE7C,KAAK,UAAU,MAAM,CAAC,QAAgB,EAAE,IAAI,GAAG,YAAI;IACzD,IAAI,CAAC;QACJ,MAAM,aAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,WAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;
|
|
1
|
+
{"version":3,"file":"which.js","sourceRoot":"","sources":["../../src/utils/which.ts"],"names":[],"mappings":";;;AAsBA,wBAOC;AAOD,oCAQC;AASD,4BAQC;AAaD,sBAsBC;AA/ED,2BAA+C;AAC/C,6BAA6B;AAEd,YAAI,GAAuB,cAAS,OAA9B,YAAI,GAAiB,cAAS,OAAxB,YAAI,GAAW,cAAS,OAAlB,YAAI,GAAK,cAAS,MAAC;AAE7C,KAAK,UAAU,MAAM,CAAC,QAAgB,EAAE,IAAI,GAAG,YAAI;IACzD,IAAI,CAAC;QACJ,MAAM,aAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,WAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;AAOM,KAAK,UAAU,YAAY,CAAC,QAAgB;IAClD,MAAM,UAAU,GAAG,2CAAa,YAAY,EAAC,CAAC;IAE9C,OAAO,IAAI;SACT,SAAS,CAAC,QAAQ,CAAC;SACnB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;SAC/C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClB,CAAC;AASM,KAAK,UAAU,QAAQ,CAAC,WAAmB;IACjD,KAAK,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC9C,IAAI,MAAM,MAAM,CAAC,SAAS,EAAE,YAAI,CAAC,EAAE,CAAC;YACnC,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;IACD,OAAO,EAAE,CAAC;AACX,CAAC;AAaM,KAAK,UAAU,KAAK,CAC1B,OAAe,EACf,eAAe,GAAG,IAAI;IAEtB,MAAM,QAAQ,GAAG,2CAAa,OAAO,EAAC,CAAC;IACvC,IAAI,WAAmB,CAAC;IACxB,IAAI,CAAC;QACJ,WAAW,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,IAAI,eAAe,EAAE,CAAC;gBACrB,MAAM,EAAE,aAAa,EAAE,GAAG,2CAAa,WAAW,EAAC,CAAC;gBACpD,MAAM,IAAI,aAAa,CACtB,IAAI,OAAO,uCAAuC,CAClD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACX,CAAC;QACF,CAAC;QACD,MAAM,GAAG,CAAC;IACX,CAAC;IACD,OAAO,WAAW,CAAC;AACpB,CAAC"}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "balena-cli",
|
|
3
|
-
"version": "23.2.
|
|
3
|
+
"version": "23.2.22",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "balena-cli",
|
|
9
|
-
"version": "23.2.
|
|
9
|
+
"version": "23.2.22",
|
|
10
10
|
"hasInstallScript": true,
|
|
11
11
|
"license": "Apache-2.0",
|
|
12
12
|
"dependencies": {
|
|
@@ -20713,6 +20713,7 @@
|
|
|
20713
20713
|
"version": "1.0.0",
|
|
20714
20714
|
"resolved": "https://registry.npmjs.org/strip-ansi-stream/-/strip-ansi-stream-1.0.0.tgz",
|
|
20715
20715
|
"integrity": "sha512-G8NIkSYbX2J0dvqGvznZSlXYy3CnHwfXRq+Y5zX6qDMfsVWBZINqthIjwdN3JO/gJ9ueKw4NAeY9xmSP4dxoRA==",
|
|
20716
|
+
"license": "MIT",
|
|
20716
20717
|
"dependencies": {
|
|
20717
20718
|
"ansi-regex": "^3.0.0",
|
|
20718
20719
|
"replacestream": "^4.0.3"
|
|
@@ -20725,6 +20726,7 @@
|
|
|
20725
20726
|
"version": "3.0.1",
|
|
20726
20727
|
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
|
|
20727
20728
|
"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
|
|
20729
|
+
"license": "MIT",
|
|
20728
20730
|
"engines": {
|
|
20729
20731
|
"node": ">=4"
|
|
20730
20732
|
}
|