pinokiod 3.327.0 → 3.329.0
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/kernel/bin/git.js +11 -9
- package/kernel/shell.js +4 -5
- package/package.json +1 -1
package/kernel/bin/git.js
CHANGED
|
@@ -28,15 +28,17 @@ class Git {
|
|
|
28
28
|
}, ondata)
|
|
29
29
|
}
|
|
30
30
|
async installed() {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
31
|
+
if (this.kernel.bin.installed.conda && this.kernel.bin.installed.conda_versions) {
|
|
32
|
+
let version = this.kernel.bin.installed.conda_versions.git
|
|
33
|
+
console.log("git version", version)
|
|
34
|
+
let coerced = semver.coerce(version)
|
|
35
|
+
console.log("git coerced", coerced)
|
|
36
|
+
let requirement = ">=2.51.0"
|
|
37
|
+
let satisfied = semver.satisfies(coerced, requirement)
|
|
38
|
+
console.log("git version satisfied?", satisfied)
|
|
39
|
+
if (!satisfied) {
|
|
40
|
+
return false
|
|
41
|
+
}
|
|
40
42
|
}
|
|
41
43
|
if (this.kernel.platform === "darwin") {
|
|
42
44
|
return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
|
package/kernel/shell.js
CHANGED
|
@@ -167,11 +167,10 @@ class Shell {
|
|
|
167
167
|
let app_env = await Environment.get(api_path, this.kernel)
|
|
168
168
|
this.env = Object.assign(this.env, app_env)
|
|
169
169
|
}
|
|
170
|
-
let PATH_KEY;
|
|
171
|
-
if (this.env
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
PATH_KEY = "PATH"
|
|
170
|
+
let PATH_KEY = Object.keys(this.env).find((key) => key.toLowerCase() === "path") || "PATH";
|
|
171
|
+
if (!this.env[PATH_KEY]) {
|
|
172
|
+
// fall back to whichever casing exists so we don't end up writing to an undefined key
|
|
173
|
+
this.env[PATH_KEY] = this.env.Path || this.env.PATH || this.env.path;
|
|
175
174
|
}
|
|
176
175
|
if (this.shell === "cmd.exe") {
|
|
177
176
|
// ignore
|