pinokiod 3.2.172 → 3.2.174

package/kernel/shell.js

@@ -536,6 +536,8 @@ class Shell {
 
     // 2. conda_activation
 
+    const timeout = "C:\\Windows\\System32\\timeout`
+
     let conda_activation = []
     if (conda_activate) {
       if (typeof conda_activate === "string") {
@@ -557,9 +559,9 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
           `conda activate ${env_path}`,
-          (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
         ]
       } else {
         conda_activation = [
@@ -568,9 +570,9 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
           `conda activate ${env_path}`,
-          (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
         ]
       }
     } else if (conda_name) {
@@ -580,9 +582,9 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
           `conda activate ${conda_name}`,
-          (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
         ]
       } else {
         let envs_path = this.kernel.bin.path("miniconda/envs")
@@ -594,9 +596,9 @@ class Shell {
             `conda deactivate`,
             `conda deactivate`,
             `conda deactivate`,
-            (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+            (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
             `conda activate ${conda_name}`,
-            (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+            (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
           ]
         } else {
           conda_activation = [
@@ -605,9 +607,9 @@ class Shell {
             `conda deactivate`,
             `conda deactivate`,
             `conda deactivate`,
-            (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+            (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
             `conda activate ${conda_name}`,
-            (this.platform === 'win32' ? 'timeout /t 1 > nul' : 'sleep 1'),
+            (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
           ]
         }
       }
@@ -679,13 +681,14 @@ class Shell {
     }
 
     // 3. construct params.message
-    params.message = conda_activation.concat(venv_activation).concat(params.message).map((cmd) => {
-      if (this.platform === 'win32') {
-        return `call ${cmd}`
-      } else {
-        return cmd
-      }
-    })
+    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}`
+//      } else {
+//        return cmd
+//      }
+//    })
     return params
   }
   async exec(params) {

package/package.json

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