@tryglen/cli 0.39.2 → 0.39.3
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/dist/clients/npm/update.js +12 -8
- package/dist/clients/npm/update.js.map +1 -1
- package/dist/commands/install/_utils/ensure-global-cli.js +62 -22
- package/dist/commands/install/_utils/ensure-global-cli.js.map +1 -1
- package/dist/commands/install/_utils/prepare-machine.js +40 -8
- package/dist/commands/install/_utils/prepare-machine.js.map +1 -1
- package/package.json +1 -1
|
@@ -38,14 +38,19 @@ const fetchLatest = async () => {
|
|
|
38
38
|
return typeof version === "string" ? version : null;
|
|
39
39
|
};
|
|
40
40
|
const isWithinDir = (path, dir) => `${path}/`.startsWith(`${dir.replace(/\/+$/, "")}/`);
|
|
41
|
-
const
|
|
42
|
-
const prefix = runProgram("npm", ["prefix", "-g"], { timeoutMs: 3000 });
|
|
43
|
-
if (!prefix.ok)
|
|
44
|
-
return false;
|
|
41
|
+
const runsFrom = (prefix) => {
|
|
45
42
|
const bin = files.realpathSync(process.argv[1] ?? "");
|
|
46
|
-
const root = files.realpathSync(prefix
|
|
43
|
+
const root = files.realpathSync(prefix);
|
|
47
44
|
return bin.ok && root.ok && isWithinDir(bin.value, root.value);
|
|
48
45
|
};
|
|
46
|
+
// `glen install` falls back to ~/.glen when npm's global folder isn't writable; update it there, not into the folder that refused it.
|
|
47
|
+
const installTarget = () => {
|
|
48
|
+
const prefix = runProgram("npm", ["prefix", "-g"], { timeoutMs: 3000 });
|
|
49
|
+
if (prefix.ok && runsFrom(prefix.value.stdout.trim()))
|
|
50
|
+
return "npm";
|
|
51
|
+
return runsFrom(glenHome()) ? "glen" : null;
|
|
52
|
+
};
|
|
53
|
+
const isNpmGlobalInstall = () => installTarget() !== null;
|
|
49
54
|
const lockStartedAt = () => {
|
|
50
55
|
const raw = files.readTextSync(join(lockPath(), "started"));
|
|
51
56
|
const n = raw.ok ? Number(raw.value) : Number.NaN;
|
|
@@ -72,9 +77,8 @@ const acquireLock = () => {
|
|
|
72
77
|
const runSelfUpdate = () => {
|
|
73
78
|
if (!acquireLock())
|
|
74
79
|
return { ok: false, reason: "locked" };
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
});
|
|
80
|
+
const prefix = installTarget() === "glen" ? ["--prefix", glenHome()] : [];
|
|
81
|
+
const r = runProgram("npm", ["install", "-g", ...prefix, "@tryglen/cli@latest"], { timeoutMs: 120_000 });
|
|
78
82
|
void files.removeSync(lockPath(), { recursive: true });
|
|
79
83
|
if (r.ok)
|
|
80
84
|
return { ok: true };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/clients/npm/update.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/clients/npm/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { basename, dirname, isAbsolute, join } from "node:path";
|
|
2
2
|
import { cliErr } from "../../../core/errors/cli-error.js";
|
|
3
|
+
import { env } from "../../../core/system/env.js";
|
|
3
4
|
import { files } from "../../../core/system/files.js";
|
|
5
|
+
import { glenHome } from "../../../core/state/glen-home.js";
|
|
4
6
|
import { err, ok } from "../../../core/errors/result.js";
|
|
5
7
|
import { runProgram } from "../../../core/system/run-program.js";
|
|
6
8
|
import { semverNewer } from "../../../clients/npm/semver-newer.js";
|
|
@@ -31,7 +33,25 @@ const versionAt = (glenPath) => {
|
|
|
31
33
|
return null;
|
|
32
34
|
return /(\d+\.\d+\.\d+)/.exec(r.value.stdout)?.[1] ?? null;
|
|
33
35
|
};
|
|
34
|
-
|
|
36
|
+
const onPath = (dir) => (env().PATH ?? "")
|
|
37
|
+
.split(":")
|
|
38
|
+
.some((entry) => entry.replace(/\/+$/, "") === dir.replace(/\/+$/, ""));
|
|
39
|
+
const targetAt = (npmPath, prefix, fallback) => ({
|
|
40
|
+
npmPath,
|
|
41
|
+
prefix,
|
|
42
|
+
binDir: join(prefix, "bin"),
|
|
43
|
+
glenPath: join(prefix, "bin", "glen"),
|
|
44
|
+
fallback,
|
|
45
|
+
});
|
|
46
|
+
// The user's own npm prefix (~/.npmrc, the npm docs' EACCES fix) wins when its bin is on PATH.
|
|
47
|
+
const configuredPrefix = (npmPath) => {
|
|
48
|
+
const r = runProgram(npmPath, ["prefix", "-g"], { timeoutMs: 10_000 });
|
|
49
|
+
if (!r.ok)
|
|
50
|
+
return null;
|
|
51
|
+
const prefix = r.value.stdout.trim();
|
|
52
|
+
return isAbsolute(prefix) && onPath(join(prefix, "bin")) ? prefix : null;
|
|
53
|
+
};
|
|
54
|
+
// Otherwise the folder beside the npm shim on PATH, not its realpath: Vite+ resolves it into a private runtime.
|
|
35
55
|
const npmGlobalTarget = () => {
|
|
36
56
|
const found = runProgram("which", ["npm"], { timeoutMs: 10_000 });
|
|
37
57
|
if (!found.ok)
|
|
@@ -40,14 +60,17 @@ const npmGlobalTarget = () => {
|
|
|
40
60
|
if (!isAbsolute(npmPath) || basename(npmPath) !== "npm")
|
|
41
61
|
return null;
|
|
42
62
|
const binDir = dirname(npmPath);
|
|
63
|
+
const configured = configuredPrefix(npmPath);
|
|
64
|
+
if (configured)
|
|
65
|
+
return targetAt(npmPath, configured, false);
|
|
43
66
|
if (basename(binDir) !== "bin")
|
|
44
67
|
return null;
|
|
45
|
-
|
|
46
|
-
return { npmPath, prefix, binDir, glenPath: join(binDir, "glen") };
|
|
68
|
+
return targetAt(npmPath, dirname(binDir), false);
|
|
47
69
|
};
|
|
70
|
+
const PACKAGE = "@tryglen/cli@latest";
|
|
48
71
|
const manualInstall = (prefix) => prefix
|
|
49
|
-
? `npm install -g --prefix ${prefix}
|
|
50
|
-
:
|
|
72
|
+
? `npm install -g --prefix ${prefix} ${PACKAGE}`
|
|
73
|
+
: `npm install -g ${PACKAGE}`;
|
|
51
74
|
const installFailed = (hadExisting, prefix, failure) => cliErr("Exec", {
|
|
52
75
|
code: "install.cli_install_failed",
|
|
53
76
|
what: hadExisting
|
|
@@ -57,21 +80,34 @@ const installFailed = (hadExisting, prefix, failure) => cliErr("Exec", {
|
|
|
57
80
|
...(failure.path ? { path: failure.path } : {}),
|
|
58
81
|
remedy: failure.remedy ??
|
|
59
82
|
(failure.permission
|
|
60
|
-
? `npm can't write to its global folder. Fix that (${PERMISSIONS_DOC}), then run: ${manualInstall(
|
|
83
|
+
? `npm can't write to its global folder. Fix that (${PERMISSIONS_DOC}), then run: ${manualInstall(null)}`
|
|
61
84
|
: `install it manually: ${manualInstall(prefix)}`),
|
|
62
85
|
});
|
|
86
|
+
const runInstall = (target) => runProgram(target.npmPath, ["install", "-g", "--prefix", target.prefix, PACKAGE], { timeoutMs: 300_000 });
|
|
87
|
+
const isPermissionFailure = (failure) => /EACCES|EPERM|permission denied/i.test(`${failure.spawnError ?? ""}\n${failure.stderr}`);
|
|
88
|
+
const failureWhy = (failure) => failure.spawnError ??
|
|
89
|
+
npmErrorCause(failure.stderr).cause ??
|
|
90
|
+
(failure.stderrTail || `npm exited with code ${failure.code}`);
|
|
91
|
+
const installFailedFrom = (target, hadExisting, failure) => installFailed(hadExisting, target.prefix, {
|
|
92
|
+
why: failureWhy(failure),
|
|
93
|
+
path: npmErrorCause(failure.stderr).logPath,
|
|
94
|
+
permission: isPermissionFailure(failure),
|
|
95
|
+
});
|
|
96
|
+
// A root-owned global folder (system Node, /usr/local) falls back to ~/.glen, which uninstall removes whole.
|
|
63
97
|
const installGlobally = (target, hadExisting) => {
|
|
64
|
-
const installed =
|
|
98
|
+
const installed = runInstall(target);
|
|
65
99
|
if (installed.ok)
|
|
66
|
-
return ok(
|
|
67
|
-
|
|
68
|
-
|
|
100
|
+
return ok(target);
|
|
101
|
+
if (!isPermissionFailure(installed.error))
|
|
102
|
+
return err(installFailedFrom(target, hadExisting, installed.error));
|
|
103
|
+
const fallback = targetAt(target.npmPath, glenHome(), true);
|
|
104
|
+
const retried = runInstall(fallback);
|
|
105
|
+
if (retried.ok)
|
|
106
|
+
return ok(fallback);
|
|
69
107
|
return err(installFailed(hadExisting, target.prefix, {
|
|
70
|
-
why:
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
path: npm.logPath,
|
|
74
|
-
permission: /EACCES|permission denied/i.test(`${spawnError ?? ""}\n${stderr}`),
|
|
108
|
+
why: `npm can't write to ${target.prefix}, and installing into ${fallback.prefix} failed too: ${failureWhy(retried.error)}`,
|
|
109
|
+
path: npmErrorCause(retried.error.stderr).logPath,
|
|
110
|
+
permission: true,
|
|
75
111
|
}));
|
|
76
112
|
};
|
|
77
113
|
const profileName = () => shellProfile.loginProfile()?.profilePath ?? "your shell profile";
|
|
@@ -88,7 +124,7 @@ const ensureGlobalCli = (onInstallStart) => {
|
|
|
88
124
|
if (existing) {
|
|
89
125
|
const version = versionAt(existing);
|
|
90
126
|
if (version && !semverNewer(cliVersion, version))
|
|
91
|
-
return ok("present");
|
|
127
|
+
return ok({ status: "present", addToPath: null });
|
|
92
128
|
}
|
|
93
129
|
if (!agentBin.isInstalled("npm"))
|
|
94
130
|
return err(cliErr("Exec", {
|
|
@@ -98,14 +134,15 @@ const ensureGlobalCli = (onInstallStart) => {
|
|
|
98
134
|
}));
|
|
99
135
|
const hadExisting = existing !== null;
|
|
100
136
|
onInstallStart?.(hadExisting);
|
|
101
|
-
const
|
|
102
|
-
if (!
|
|
137
|
+
const found = npmGlobalTarget();
|
|
138
|
+
if (!found)
|
|
103
139
|
return err(installFailed(hadExisting, null, {
|
|
104
140
|
why: "couldn't find npm's install folder from the npm on PATH",
|
|
105
141
|
}));
|
|
106
|
-
const installed = installGlobally(
|
|
142
|
+
const installed = installGlobally(found, hadExisting);
|
|
107
143
|
if (!installed.ok)
|
|
108
144
|
return installed;
|
|
145
|
+
const target = installed.value;
|
|
109
146
|
const installedVersion = versionAt(target.glenPath);
|
|
110
147
|
if (!installedVersion || semverNewer(cliVersion, installedVersion))
|
|
111
148
|
return err(installFailed(hadExisting, target.prefix, {
|
|
@@ -113,11 +150,14 @@ const ensureGlobalCli = (onInstallStart) => {
|
|
|
113
150
|
? `${target.glenPath} reports ${installedVersion} after install, expected ${cliVersion}`
|
|
114
151
|
: `${target.glenPath} didn't run after install`,
|
|
115
152
|
}));
|
|
153
|
+
const status = hadExisting ? "updated" : "installed";
|
|
116
154
|
const resolved = persistentGlenPath();
|
|
117
155
|
const resolvedVersion = resolved ? versionAt(resolved) : null;
|
|
118
|
-
if (
|
|
119
|
-
return
|
|
120
|
-
|
|
156
|
+
if (resolved && resolvedVersion && !semverNewer(cliVersion, resolvedVersion))
|
|
157
|
+
return ok({ status, addToPath: null });
|
|
158
|
+
if (target.fallback)
|
|
159
|
+
return ok({ status, addToPath: target.binDir });
|
|
160
|
+
return err(pathProblem(target, hadExisting, resolved));
|
|
121
161
|
};
|
|
122
162
|
export { ensureGlobalCli };
|
|
123
163
|
//# sourceMappingURL=ensure-global-cli.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-global-cli.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/ensure-global-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,eAAe,GACnB,8FAA8F,CAAC;AAEjG,kIAAkI;AAClI,MAAM,qBAAqB,GAAG,CAAC,SAAiB,EAAW,EAAE;IAC3D,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,GAAkB,EAAE;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IAC3B,OAAO,CACL,KAAK,CAAC,KAAK,CAAC,MAAM;SACf,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAC3E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,QAAgB,EAAiB,EAAE;IACpD,MAAM,CAAC,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC,CAAC,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IACvB,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AAC7D,CAAC,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"ensure-global-cli.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/ensure-global-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { credentials } from "../../../core/state/credentials.js";
|
|
|
4
4
|
import { files } from "../../../core/system/files.js";
|
|
5
5
|
import { installReceipt } from "../../../core/state/install-receipt.js";
|
|
6
6
|
import { out } from "../../../core/terminal/out.js";
|
|
7
|
+
import { prompt } from "../../../core/terminal/prompt.js";
|
|
7
8
|
import { err, ok } from "../../../core/errors/result.js";
|
|
8
9
|
import { shellProfile } from "../../../core/system/shell-profile.js";
|
|
9
10
|
import { glenState } from "../../../core/state/state.js";
|
|
@@ -59,17 +60,48 @@ const addLoginCheck = async () => {
|
|
|
59
60
|
out.warn(recorded.error);
|
|
60
61
|
return [recorded.error];
|
|
61
62
|
};
|
|
62
|
-
const
|
|
63
|
+
const notOnPath = (binDir, profilePath) => cliErr("Exec", {
|
|
64
|
+
code: "install.cli_not_on_path",
|
|
65
|
+
what: `the glen command is installed in ${binDir}, which isn't on PATH, so the plugins can't run it`,
|
|
66
|
+
remedy: `add \`export PATH="${binDir}:$PATH"\` to ${profilePath ?? "your shell profile"}, then open a new terminal`,
|
|
67
|
+
});
|
|
68
|
+
// Agent hooks run `$SHELL -lc`, so the login profile is what makes `glen` resolve for them.
|
|
69
|
+
const addToPath = async (binDir) => {
|
|
70
|
+
const profile = shellProfile.loginProfile();
|
|
71
|
+
out.info(`npm's global folder isn't writable, so glen went into ${binDir}`);
|
|
72
|
+
const answer = profile
|
|
73
|
+
? await prompt.confirm(`Add it to PATH in ${profile.profilePath}?`, true)
|
|
74
|
+
: null;
|
|
75
|
+
if (!profile || answer !== true) {
|
|
76
|
+
const missing = notOnPath(binDir, profile?.profilePath ?? null);
|
|
77
|
+
out.warn(missing);
|
|
78
|
+
return [missing];
|
|
79
|
+
}
|
|
80
|
+
const added = await shellProfile.addPathBlock(profile.profilePath, binDir);
|
|
81
|
+
if (!added.ok) {
|
|
82
|
+
out.warn(added.error);
|
|
83
|
+
return [added.error];
|
|
84
|
+
}
|
|
85
|
+
const recorded = await installReceipt.recordShellProfile(profile.profilePath);
|
|
86
|
+
if (!recorded.ok) {
|
|
87
|
+
out.warn(recorded.error);
|
|
88
|
+
return [recorded.error];
|
|
89
|
+
}
|
|
90
|
+
out.success(`${binDir} added to PATH in ${profile.profilePath} (open a new terminal to use glen)`);
|
|
91
|
+
return [];
|
|
92
|
+
};
|
|
93
|
+
const ensureCliBinary = async () => {
|
|
63
94
|
const outcome = ensureGlobalCli((hadExisting) => out.step(hadExisting
|
|
64
95
|
? "Updating the glen command (npm install -g @tryglen/cli@latest)…"
|
|
65
96
|
: "Installing the glen command (npm install -g @tryglen/cli@latest)…"));
|
|
66
|
-
if (outcome.ok) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
return [];
|
|
97
|
+
if (!outcome.ok) {
|
|
98
|
+
out.warn(outcome.error);
|
|
99
|
+
return [outcome.error];
|
|
70
100
|
}
|
|
71
|
-
|
|
72
|
-
|
|
101
|
+
const { status, addToPath: binDir } = outcome.value;
|
|
102
|
+
if (status !== "present")
|
|
103
|
+
out.success(`glen command ${status}`);
|
|
104
|
+
return binDir ? addToPath(binDir) : [];
|
|
73
105
|
};
|
|
74
106
|
const prepareMachine = async (paths) => {
|
|
75
107
|
const overrides = await applyPathOverrides(paths);
|
|
@@ -78,7 +110,7 @@ const prepareMachine = async (paths) => {
|
|
|
78
110
|
return ok([
|
|
79
111
|
...(await recordStatePaths()),
|
|
80
112
|
...(await addLoginCheck()),
|
|
81
|
-
...ensureCliBinary(),
|
|
113
|
+
...(await ensureCliBinary()),
|
|
82
114
|
]);
|
|
83
115
|
};
|
|
84
116
|
export { prepareMachine };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-machine.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/prepare-machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAiB,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACpD,OAAO,EAAe,GAAG,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AASzD,MAAM,kBAAkB,GAAG,KAAK,EAC9B,KAAY,EACqB,EAAE;IACnC,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAU,EAAE,CAAC;QAC9D,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC/B,OAAO,GAAG,CACR,MAAM,CAAC,OAAO,EAAE;gBACd,IAAI,EAAE,6BAA6B;gBACnC,IAAI,EAAE,KAAK,GAAG,iCAAiC;gBAC/C,IAAI;gBACJ,MAAM,EAAE,eAAe,GAAG,8CAA8C;aACzE,CAAC,CACH,CAAC;QACJ,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,OAAO,SAAS,CAAC;QACpC,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,gBAAgB,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,IAAyB,EAAE;IACvD,KAAK,MAAM,IAAI,IAAI;QACjB,WAAW,CAAC,IAAI,EAAE;QAClB,SAAS,CAAC,IAAI,EAAE;QAChB,kBAAkB,CAAC,IAAI,EAAE;QACzB,cAAc,CAAC,IAAI,EAAE;KACtB,EAAE,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,IAAyB,EAAE;IACpD,MAAM,OAAO,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;IAC5C,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACd,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB;QACnC,GAAG,CAAC,OAAO,CAAC,8BAA8B,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9E,IAAI,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,CAAC;IAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"prepare-machine.js","sourceRoot":"","sources":["../../../../src/commands/install/_utils/prepare-machine.ts"],"names":[],"mappings":"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"}
|