pinokiod 7.1.6 → 7.1.7

package/kernel/index.js

@@ -834,7 +834,6 @@ class Kernel {
       try {
         const result = execSync(`where ${name}`, { env: this.envs, encoding: "utf-8" })
         const lines = result.trim().split("\r\n")
-        console.log({ result, lines })
         if (pattern) {
           let match = null
           for(let line of lines) {
@@ -843,10 +842,8 @@ class Kernel {
               matches[2] += "g"   // if g option is not included, include it (need it for matchAll)
             }
             let re = new RegExp(matches[1], matches[2])
-            console.log("testing", { line, pattern, re })
             if (re.test(line)) {
               match = line 
-              console.log("matched", { line })
               break
             }
           }
@@ -859,7 +856,6 @@ class Kernel {
           }
         }
       } catch (e) {
-        console.log("Error", e)
         return null
       }
     } else {
@@ -991,6 +987,18 @@ class Kernel {
     this.template = new Template()
     try {
       if (this.homedir) {
+        // Initialize template state before async startup tasks update or render it.
+        await this.template.init({
+          kernel: this,
+          system,
+          platform: this.platform,
+          arch: this.arch,
+          vram: this.vram,
+          ram: this.ram,
+          proxy: (port) => {
+            return this.api.get_proxy_url("/proxy", port)
+          },
+        })
 
         // 0. create homedir
         let home_exists = await this.exists(this.homedir)
@@ -1164,17 +1172,6 @@ class Kernel {
       //await this.shell.init()
 
       if (this.homedir) {
-        await this.template.init({
-          kernel: this,
-          system,
-          platform: this.platform,
-          arch: this.arch,
-          vram: this.vram,
-          ram: this.ram,
-          proxy: (port) => {
-            return this.api.get_proxy_url("/proxy", port)
-          },
-        })
 //        setTimeout(() => {
 //          this.refresh()    
 //        }, 3000)

package/kernel/shell.js

@@ -174,7 +174,7 @@ class Shell {
       // fall back to whichever casing exists so we don't end up writing to an undefined key
       this.env[PATH_KEY] = this.env.Path || this.env.PATH || this.env.path;
     }
-    if (this.shell === "cmd.exe") {
+    if (this.isCmdShell()) {
       // ignore 
     } else {
       this.env[PATH_KEY]= this.kernel.shellpath || [
@@ -253,6 +253,10 @@ class Shell {
       }
     }
   }
+  isCmdShell(shellName=this.shell) {
+    const name = (shellName || '').toLowerCase()
+    return name.includes('cmd.exe') || name === 'cmd'
+  }
   async start(params, ondata) {
     this.ondata = ondata
     if (this.nudgeRestoreTimer) {
@@ -604,7 +608,7 @@ class Shell {
 
     // Log before resolving
     this._log(buf, cleaned)
-    if (this.shell === 'cmd.exe') {
+    if (this.isCmdShell()) {
       // For Windows
       this.vt.write('\x1Bc');
       //this.ptyProcess.write('cls\n');
@@ -749,7 +753,7 @@ class Shell {
         // if params.message is empty, filter out
         //let delimiter = " && "
         let delimiter
-        if (this.shell === "cmd.exe") {
+        if (this.isCmdShell()) {
           if (params.chain) {
             if (params.chain === "&") {
               delimiter = " && ";   // stop if one command in the chain fails
@@ -887,7 +891,7 @@ class Shell {
     // 2. conda_activation
 
     let timeout
-    if (this.shell === "cmd.exe") {
+    if (this.isCmdShell()) {
       timeout = 'C:\\Windows\\System32\\timeout /t 1 > nul'
     } else {
       //timeout = "sleep '1'"

package/kernel/shells.js

@@ -17,6 +17,23 @@ class Shells {
     this.bracketedPasteDetections = new Map()
 
   }
+  resolveShellExecutable(shellName) {
+    if (typeof shellName !== "string") {
+      return shellName
+    }
+    const trimmed = shellName.trim()
+    if (!trimmed || path.isAbsolute(trimmed)) {
+      return trimmed
+    }
+    if (trimmed.includes("/") || trimmed.includes("\\")) {
+      return trimmed
+    }
+    const resolved = this.kernel.which(trimmed)
+    if (resolved) {
+      return resolved
+    }
+    return trimmed
+  }
   /*
   params := {
     "id": <shell id>,
@@ -237,6 +254,10 @@ class Shells {
       )
     }
 
+    if (params.shell) {
+      // Resolve bare command names before probing/launching so Windows can find bundled bash reliably.
+      params.shell = this.resolveShellExecutable(params.shell)
+    }
     const plannedShell = params.shell || (this.kernel.platform === 'win32' ? 'cmd.exe' : 'bash')
     await this.ensureBracketedPasteSupport(plannedShell)
     let sh = new Shell(this.kernel)

package/package.json

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