pinokiod 3.19.28 → 3.19.30

package/kernel/shell.js

@@ -128,7 +128,7 @@ class Shell {
     } else if (this.env.PATH) {
       PATH_KEY = "PATH"
     }
-    if (this.platform === 'win32') {
+    if (this.shell === "cmd.exe") {
       // ignore 
     } else {
       this.env[PATH_KEY]= this.kernel.shellpath || [
@@ -433,7 +433,7 @@ class Shell {
 
     // Log before resolving
     this._log(buf, cleaned)
-    if (this.platform === 'win32') {
+    if (this.shell === 'cmd.exe') {
       // For Windows
       this.vt.write('\x1Bc');
       //this.ptyProcess.write('cls\n');
@@ -461,6 +461,7 @@ class Shell {
       this.persistent = params.persistent
     }
     this.prompt_pattern = await this.prompt(params.path)
+    console.log("Prompt Pattern", this.prompt_pattern)
     this.cb = cb
     console.log("This.exec")
     let r = await this.exec(params)
@@ -490,7 +491,7 @@ class Shell {
 
       //let re = /([\r\n]+[^\r\n]+)(\1)/gs
       let re = /(.+)(\1)/gs
-      console.log("Prompt spawn")
+      console.log("Prompt spawn", this.shell)
       let term = pty.spawn(this.shell, this.args, config)
       let ready
       let vt = new Terminal({
@@ -565,7 +566,7 @@ class Shell {
         // if params.message is empty, filter out
         //let delimiter = " && "
         let delimiter
-        if (this.platform === "win32") {
+        if (this.shell === "cmd.exe") {
           if (params.chain) {
             if (params.chain === "&") {
               delimiter = " && ";   // stop if one command in the chain fails
@@ -692,7 +693,7 @@ class Shell {
     // 2. conda_activation
 
     let timeout
-    if (this.platform === "win32") {
+    if (this.shell === "cmd.exe") {
       timeout = 'C:\\Windows\\System32\\timeout /t 1 > nul'
     } else {
       timeout = 'sleep 1'
@@ -703,7 +704,7 @@ class Shell {
       if (typeof conda_activate === "string") {
         if (conda_activate === "minimal") {
           conda_activation = [
-            (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
             'conda activate base',
           ]
         }
@@ -715,7 +716,7 @@ class Shell {
       let env_exists = await this.exists(env_path)
       if (env_exists) {
         conda_activation = [
-          (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
@@ -725,7 +726,7 @@ class Shell {
         ]
       } else {
         conda_activation = [
-          (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
           `conda deactivate`,
           `conda deactivate`,
@@ -738,7 +739,7 @@ class Shell {
     } else if (conda_name) {
       if (conda_name === "base") {
         conda_activation = [
-          (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
@@ -752,7 +753,7 @@ class Shell {
         let env_exists = await this.exists(env_path)
         if (env_exists) {
           conda_activation = [
-            (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
             `conda deactivate`,
             `conda deactivate`,
             `conda deactivate`,
@@ -762,7 +763,7 @@ class Shell {
           ]
         } else {
           conda_activation = [
-            (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            (this.shell === 'cmd.exe' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
             `conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
             `conda deactivate`,
             `conda deactivate`,
@@ -1243,7 +1244,7 @@ ${cleaned}
               this.params.onready()
             }
             if (this.ptyProcess) {
-              this.ptyProcess.write(`${this.cmd}${os.EOL}`)
+              this.ptyProcess.write(`${this.cmd}${this.EOL}`)
 //              setTimeout(() => {
 //                this.ptyProcess.write('\x1B[?2004h');
 //              }, 500)

package/package.json

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