pinokiod 3.0.19 → 3.0.21

package/kernel/bin/playwright.js

@@ -30,7 +30,7 @@ class Playwright {
     await this.kernel.exec({
       message: [
 //        "npm init -y",
-        "which npm",
+//        "which npm",
 //        "npm config get userconfig",
 //        "npm config get globalconfig",
 //        "npm config list -l --loglevel verbose",

package/kernel/shell.js

@@ -461,8 +461,8 @@ class Shell {
 
         let delimiter
         if (this.platform === "win32") {
-          //delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
-          delimiter = " & "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          //delimiter = " & "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
         } else {
           delimiter = " ; ";
         }

package/kernel/shells.js

@@ -31,13 +31,16 @@ class Shells {
     let sh = new Shell(this.kernel)
     let m
     if (this.kernel.platform === "win32") {
-      m = "ls"
-    } else {
       m = "dir"
+    } else {
+      m = "ls"
     }
     let response = await sh.start({
       message: m,
       env: this.kernel.bin.envs({}),
+      conda: {
+        skip: true
+      }
     }, async (stream) => {
       process.stdout.write(stream.raw)
     })

package/kernel/sysinfo.js

@@ -1,4 +1,6 @@
 const system = require('systeminformation')
+const fs = require('fs')
+const path = require('path')
 class Sysinfo {
   async init(kernel) {
     this.kernel = kernel
@@ -93,6 +95,9 @@ class Sysinfo {
   async bluetooth() {
     this.info.bluetooth = await system.bluetoothDevices()
   }
+  exists(_path) {
+    return new Promise(r=>fs.access(_path, fs.constants.F_OK, e => r(!e)))
+  }
   async env () {
     let cmd
     if (this.kernel.platform === "win32") {
@@ -107,8 +112,19 @@ class Sysinfo {
 //    console.log(_res)
 //    console.log("############### DEBUGGING ENV FINISH")
 
-    let res = await this.kernel.bin.exec({ message: cmd }, (stream) => {
-    })
+    let conda_path = path.resolve(this.kernel.homedir, "bin", "miniconda")
+    let conda_exists = await this.exists(conda_path)
+
+    let res
+    if (conda_exists) {
+      res = await this.kernel.bin.exec({ message: cmd }, (stream) => {
+      })
+    } else {
+      console.log("skip conda")
+      res = await this.kernel.bin.exec({ message: cmd, conda: { skip: true } }, (stream) => {
+      })
+    }
+
     let lines = res.response.split(/[\r\n]+/)
     let vars = []
     let started

package/package.json

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