pinokiod 2.1.11 → 2.1.12
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 +10 -7
- 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,16 @@ 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
|
+
|
|
331
341
|
}
|
|
332
342
|
|
|
333
343
|
// /// B. base path initialization
|
|
@@ -350,13 +360,6 @@ class Bin {
|
|
|
350
360
|
|
|
351
361
|
console.log("this.installed", this.installed)
|
|
352
362
|
|
|
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
363
|
|
|
361
364
|
|
|
362
365
|
this.installed_initialized = true
|
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
|