pinokiod 3.19.37 → 3.19.39

package/kernel/shell.js

@@ -569,6 +569,15 @@ class Shell {
 //        let m = params.message + delimiter + `echo "FINISHED: ${params.message}"\r\n`
 //        return m
       } else if (Array.isArray(params.message)) {
+
+        let message = []
+        for(let i=0; i<params.message.length; i++) {
+          message.push(params.message[i])
+          message.push(`echo #${i}`)
+        }
+        params.message = message
+
+
 //        params.message.push(`echo "SHELL FINISHED RUNNING"\r\n`)
         // if params.message is empty, filter out
         //let delimiter = " && "
@@ -626,6 +635,17 @@ class Shell {
       return ""
     }
   }
+  conda_hook () {
+    if (this.platform === "win32") {
+      if (/bash/i.test(this.shell)) {
+        return "source conda.sh"
+      } else {
+        return "conda_hook"
+      }
+    } else {
+      return `eval "$(conda shell.bash hook)"`
+    }
+  }
   async activate(params) {
 
     // conda and venv can coexist
@@ -706,12 +726,14 @@ class Shell {
       timeout = 'sleep 1'
     }
 
+
+    let conda_hook = this.conda_hook()
     let conda_activation = []
     if (conda_activate) {
       if (typeof conda_activate === "string") {
         if (conda_activate === "minimal") {
           conda_activation = [
-            (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            conda_hook,
             'conda activate base',
           ]
         }
@@ -723,7 +745,7 @@ class Shell {
       let env_exists = await this.exists(env_path)
       if (env_exists) {
         conda_activation = [
-          (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          conda_hook,
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
@@ -733,7 +755,7 @@ class Shell {
         ]
       } else {
         conda_activation = [
-          (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          conda_hook,
           `conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
           `conda deactivate`,
           `conda deactivate`,
@@ -746,7 +768,7 @@ class Shell {
     } else if (conda_name) {
       if (conda_name === "base") {
         conda_activation = [
-          (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          conda_hook,
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
@@ -760,7 +782,7 @@ class Shell {
         let env_exists = await this.exists(env_path)
         if (env_exists) {
           conda_activation = [
-            (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            conda_hook,
             `conda deactivate`,
             `conda deactivate`,
             `conda deactivate`,
@@ -770,7 +792,7 @@ class Shell {
           ]
         } else {
           conda_activation = [
-            (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            conda_hook,
             `conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
             `conda deactivate`,
             `conda deactivate`,

package/package.json

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