pinokiod 2.1.11 → 2.1.13
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/index.js +15 -7
- package/kernel/bin/registry.js +11 -1
- package/kernel/sysinfo.js +4 -4
- package/package.json +1 -1
- package/server/index.js +3 -2
package/kernel/bin/index.js
CHANGED
|
@@ -328,6 +328,21 @@ class Bin {
|
|
|
328
328
|
}
|
|
329
329
|
}
|
|
330
330
|
this.installed.brew = new Set(brew)
|
|
331
|
+
|
|
332
|
+
|
|
333
|
+
// check brew_installed
|
|
334
|
+
console.log("checking brew installed")
|
|
335
|
+
let e = await this.kernel.bin.exists("homebrew")
|
|
336
|
+
let { stdout }= await this.kernel.bin.exec({ message: "xcode-select -p" }, (stream) => { })
|
|
337
|
+
let e2 = /(.*Library.*Developer.*CommandLineTools.*|.*Xcode.*Developer.*)/gi.test(stdout)
|
|
338
|
+
console.log({ e, e2, stdout })
|
|
339
|
+
this.brew_installed = e && e2
|
|
340
|
+
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
if (this.platform === "win32") {
|
|
344
|
+
this.registry_installed = await this.kernel.bin.mod.registry.installed()
|
|
345
|
+
console.log("initial registry_installed", this.registry_installed)
|
|
331
346
|
}
|
|
332
347
|
|
|
333
348
|
// /// B. base path initialization
|
|
@@ -350,13 +365,6 @@ class Bin {
|
|
|
350
365
|
|
|
351
366
|
console.log("this.installed", this.installed)
|
|
352
367
|
|
|
353
|
-
// check brew_installed
|
|
354
|
-
console.log("checking brew installed")
|
|
355
|
-
let e = await this.kernel.bin.exists("homebrew")
|
|
356
|
-
let { stdout }= await this.kernel.bin.exec({ message: "xcode-select -p" }, (stream) => { })
|
|
357
|
-
let e2 = /(.*Library.*Developer.*CommandLineTools.*|.*Xcode.*Developer.*)/gi.test(stdout)
|
|
358
|
-
console.log({ e, e2, stdout })
|
|
359
|
-
this.brew_installed = e && e2
|
|
360
368
|
|
|
361
369
|
|
|
362
370
|
this.installed_initialized = true
|
package/kernel/bin/registry.js
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
class Registry {
|
|
2
2
|
description = "Look for a dialog requesting admin permission and approve it to proceed. This will allow long paths on your machine, which is required for installing certain python packages."
|
|
3
|
-
async installed() {
|
|
3
|
+
async installed(force) {
|
|
4
|
+
if (!force && '_installed' in this) {
|
|
5
|
+
console.log("this._installed already determined", this._installed)
|
|
6
|
+
return this._installed
|
|
7
|
+
}
|
|
8
|
+
|
|
4
9
|
let res = await this.kernel.bin.exec({
|
|
5
10
|
message: "reg query HKLM\\SYSTEM\\CurrentControlSet\\Control\\FileSystem /v LongPathsEnabled",
|
|
6
11
|
}, (stream) => {
|
|
@@ -14,14 +19,18 @@ class Registry {
|
|
|
14
19
|
console.log("chunks", chunks)
|
|
15
20
|
if (chunks.length === 3) {
|
|
16
21
|
if (Number(chunks[2]) === 1) {
|
|
22
|
+
this._installed = true
|
|
17
23
|
return true
|
|
18
24
|
} else {
|
|
25
|
+
this._installed = false
|
|
19
26
|
return false
|
|
20
27
|
}
|
|
21
28
|
} else {
|
|
29
|
+
this._installed = false
|
|
22
30
|
return false
|
|
23
31
|
}
|
|
24
32
|
} else {
|
|
33
|
+
this._installed = false
|
|
25
34
|
return false
|
|
26
35
|
}
|
|
27
36
|
}
|
|
@@ -33,6 +42,7 @@ class Registry {
|
|
|
33
42
|
}, (stream) => {
|
|
34
43
|
ondata(stream)
|
|
35
44
|
})
|
|
45
|
+
await this.installed(true) // force refresh
|
|
36
46
|
return res
|
|
37
47
|
}
|
|
38
48
|
}
|
package/kernel/sysinfo.js
CHANGED
|
@@ -16,7 +16,7 @@ class Sysinfo {
|
|
|
16
16
|
// await this.disk()
|
|
17
17
|
}
|
|
18
18
|
async refresh() {
|
|
19
|
-
await this.time()
|
|
19
|
+
// await this.time()
|
|
20
20
|
await this.memory()
|
|
21
21
|
await this.battery()
|
|
22
22
|
await this.proc()
|
|
@@ -54,9 +54,9 @@ class Sysinfo {
|
|
|
54
54
|
this.info.gpu = gpu
|
|
55
55
|
|
|
56
56
|
}
|
|
57
|
-
async time() {
|
|
58
|
-
this.info.time = await system.time()
|
|
59
|
-
}
|
|
57
|
+
// async time() {
|
|
58
|
+
// this.info.time = await system.time()
|
|
59
|
+
// }
|
|
60
60
|
async system() {
|
|
61
61
|
this.info.system = await system.system()
|
|
62
62
|
}
|
package/package.json
CHANGED
package/server/index.js
CHANGED
|
@@ -459,9 +459,10 @@ class Server {
|
|
|
459
459
|
install_required = false
|
|
460
460
|
for(let i=0; i<requirements.length; i++) {
|
|
461
461
|
let r = requirements[i]
|
|
462
|
-
console.
|
|
462
|
+
console.time(r.name)
|
|
463
463
|
let installed = await this.installed(r)
|
|
464
|
-
console.log(
|
|
464
|
+
console.log({ r, installed })
|
|
465
|
+
console.timeEnd(r.name)
|
|
465
466
|
requirements[i].installed = installed
|
|
466
467
|
if (!installed) {
|
|
467
468
|
install_required = true
|