pinokiod 3.322.0 → 3.324.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 +14 -3
- package/package.json +1 -1
package/kernel/bin/git.js
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
const fs = require('fs')
|
|
2
2
|
const _7z = require('7zip-min-win-asar-support');
|
|
3
3
|
const fetch = require('cross-fetch')
|
|
4
|
+
const semver = require('semver')
|
|
4
5
|
const { rimraf } = require('rimraf')
|
|
5
6
|
const path = require("path")
|
|
6
7
|
class Git {
|
|
7
8
|
cmd() {
|
|
8
9
|
if (this.kernel.platform === "darwin") {
|
|
9
|
-
return "git git-lfs gh=2.82.1"
|
|
10
|
+
return "git=2.51.0 git-lfs gh=2.82.1"
|
|
10
11
|
} else if (this.kernel.platform === "win32") {
|
|
11
12
|
//return "git git-lfs gh=2.82.1 git-bash"
|
|
12
|
-
return "git git-lfs gh=2.82.1 m2-base"
|
|
13
|
+
return "git=2.51.0 git-lfs gh=2.82.1 m2-base"
|
|
13
14
|
} else {
|
|
14
|
-
return "git git-lfs gh=2.82.1"
|
|
15
|
+
return "git=2.51.0 git-lfs gh=2.82.1"
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
async install(req, ondata) {
|
|
@@ -24,6 +25,16 @@ class Git {
|
|
|
24
25
|
}, ondata)
|
|
25
26
|
}
|
|
26
27
|
async installed() {
|
|
28
|
+
let version = this.kernel.bin.installed.conda_versions.git
|
|
29
|
+
console.log("git version", version)
|
|
30
|
+
let coerced = semver.coerce(version)
|
|
31
|
+
console.log("git coerced", coerced)
|
|
32
|
+
let requirement = ">=2.51.0"
|
|
33
|
+
let satisfied = semver.satisfies(coerced, requirement)
|
|
34
|
+
console.log("git version satisfied?", satisfied)
|
|
35
|
+
if (!satisfied) {
|
|
36
|
+
return false
|
|
37
|
+
}
|
|
27
38
|
if (this.kernel.platform === "darwin") {
|
|
28
39
|
return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
|
|
29
40
|
} else if (this.kernel.platform === "win32") {
|