pinokiod 1.1.20 → 1.1.22

package/kernel/index.js

@@ -230,7 +230,7 @@ class Kernel {
 
 
       let sysinfo = new Sysinfo()
-      await sysinfo.init()
+      await sysinfo.init(this)
       let info = sysinfo.info
       await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
       await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify({
@@ -273,35 +273,6 @@ class Kernel {
       console.log("### ERROR", e)
     }
   }
-  async sysinfo() {
-    let g = await system.graphics()
-    let gpus
-    if (g && g.controllers && g.controllers.length > 0) {
-      gpus = g.controllers.map((x) => { return x.vendor.toLowerCase() })
-    } else {
-      gpus = []
-    }
-
-    let is_nvidia = gpus.find(gpu => /nvidia/i.test(gpu))
-    let is_amd = gpus.find(gpu => /(amd|advanced micro devices)/i.test(gpu))
-    let is_apple = gpus.find(gpu => /apple/i.test(gpu))
-
-    let gpu
-    if (is_nvidia) {
-      gpu = "nvidia"
-    } else if (is_amd) {
-      gpu = "amd"
-    } else if (is_apple) {
-      gpu = "apple"
-    } else if (gpus.length > 0) {
-      gpu = gpus[0]
-    } else {
-      gpu = "none"
-    }
-
-    return { gpus, gpu }
-
-  }
   async exec(params, ondata) {
 //    params.path = this.path()
 //    if (this.client) {

package/kernel/sysinfo.js

@@ -1,6 +1,7 @@
 const system = require('systeminformation')
 class Sysinfo {
-  async init() {
+  async init(kernel) {
+    this.kernel = kernel
     this.info = {}
     await this.static()
     await this.refresh()
@@ -11,6 +12,7 @@ class Sysinfo {
     await this.cpu()
     await this.os()
     await this.audio()
+    await this.env()
 //    await this.disk()
   }
   async refresh() {
@@ -91,5 +93,37 @@ class Sysinfo {
   async bluetooth() {
     this.info.bluetooth = await system.bluetoothDevices()
   }
+  async env () {
+    let cmd
+    if (this.kernel.platform === "win32") {
+      cmd = "set"
+    } else {
+      cmd = "env"
+    }
+    let res = await this.kernel.bin.exec({ message: cmd, conda: "base" }, (stream) => {
+    })
+    let lines = res.response.split(/[\r\n]+/)
+    let vars = []
+    let started
+    for(let line of lines) {
+      if (started) {
+        // end BEFORE the next occurrence of <<PINOKIO SHELL>>
+        if (/<<PINOKIO SHELL>>/.test(line)) {
+          // do nothing => ignore this line
+        } else {
+          vars.push(line)
+        }
+      } else {
+        // start AFTER the first occurrence of <<PINOKIO SHELL>>
+        if (/<<PINOKIO SHELL>>/.test(line)) {
+          started = true
+        }
+      }
+    }
+
+
+    this.info.env = process.env
+    this.info.shell_env = vars
+  }
 }
 module.exports = Sysinfo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "description": "",
   "main": "index.js",
   "scripts": {