pinokiod 3.19.68 → 3.19.71

package/kernel/index.js

@@ -603,15 +603,28 @@ class Kernel {
       })
     }
   }
-  which(name) {
+  which(name, pattern) {
     if (this.platform === "win32") {
       try {
         const result = execSync(`where ${name}`, { env: this.envs, encoding: "utf-8" })
         const lines = result.trim().split("\r\n")
-        if (lines.length > 0) {
-          return lines[0]
+        if (pattern) {
+          let match = null
+          for(let line of lines) {
+            console.log("testing", { line, pattern })
+            if (pattern.test(line)) {
+              match = line 
+              console.log("matched", { line })
+              break
+            }
+          }
+          return match
         } else {
-          return null
+          if (lines.length > 0) {
+            return lines[0]
+          } else {
+            return null
+          }
         }
       } catch (e) {
         return null

package/kernel/shell.js

@@ -991,7 +991,20 @@ class Shell {
     }
 
     // 3. construct params.message
-    params.message = conda_activation.concat(venv_activation).concat(params.message)
+    let activation = conda_activation.concat(venv_activation)
+    if (activation.length > 0) {
+      let activation_str = this.build({
+        chain: "*",
+        message: activation
+      })
+      params.message = [activation_str].concat(params.message)
+    } else {
+      params.message = params.message
+    }
+//    params.message = conda_activation.concat(venv_activation).concat(params.message)
+
+
+
 //    params.message = conda_activation.concat(venv_activation).concat(params.message).map((cmd) => {
 //      if (this.platform === 'win32') {
 //        return `call ${cmd}`
@@ -1002,8 +1015,11 @@ class Shell {
     return params
   }
   async exec(params) {
+    console.log("before activate", params.message)
     params = await this.activate(params)
+    console.log("after activate", params.message)
     this.cmd = this.build(params)
+    console.log("build", this.cmd)
     let res = await new Promise((resolve, reject) => {
       this.resolve = resolve
       this.reject = reject

package/package.json

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