pinokiod 3.4.23 → 3.4.25

package/kernel/bin/index.js

@@ -564,7 +564,7 @@ class Bin {
             if (m.name === name) {
               //await m.mod.install(this, ondata)
               const message = `${m.mod.description ? '<br>' + m.mod.description : ''}`
-              ondata({ html: `<b><i class="fas fa-circle-notch fa-spin"></i> ${progress} Installing ${name}</b>${message}` }, "notify")
+              ondata({ html: `<b><i class="fas fa-circle-notch fa-spin"></i> ${progress} Installing ${name}</b>${message}` }, "notify2")
               console.log("## Before m.mod.install", requirement)
               await m.mod.install(requirement, ondata, this.kernel)
 

package/kernel/bin/vs.js

@@ -23,14 +23,21 @@ class VS {
         ondata(stream)
       })
       ondata({ raw: `Install finished\r\n\r\n` })
-      let WARNING = "[NOTICE] If the Visual Studio Install step keeps repeating, open the 'Visual Studio Installer' app on Windows, uninstall it, and retry.\r\n"
+      let WARNING = `<div><div>[NOTICE] Visual Studio install step keeps repeating?</div>
+<ol>
+  <li>Launch <b>Visual Studio Installer</b> on Windows</li>
+  <li>Find <b>Visual Studio Build Tools 2019</b> and <b>Uninstall</b></li>
+  <li>And relaunch Pinokio</li>
+</ol></div>`
+      /*
       ondata({
         raw: `\r\n\x1b[33m${WARNING}\x1b[0m\r\n\r\n`
       })
+      */
 
       let html = `<div>
 <img src="/vsinstaller.gif">
-<div>${WARNING}</div>
+<div style="padding=5px; font-size:12px">${WARNING}</div>
 </div>`
       ondata({
         html,

package/kernel/shell.js

@@ -103,9 +103,6 @@ class Shell {
     if (this.env.CMAKE_GENERATOR) {
       delete this.env.CMAKE_GENERATOR
     }
-    if (this.env.SSLKEYLOGFILE) {
-      delete this.env.SSLKEYLOGFILE
-    }
     
 //    if (this.env.CUDA_HOME) {
 //      delete this.env.CUDA_HOME
@@ -115,6 +112,10 @@ class Shell {
         console.log("Unset env key: " + key)
         delete this.env[key]
       }
+      if (/.*(SSH|SSL).*/.test(key)) {
+        console.log("Unset env key: " + key)
+        delete this.env[key]
+      }
     }
 
     this.env.CMAKE_OBJECT_PATH_MAX = 1024

package/package.json

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

package/server/views/install.ejs

@@ -230,7 +230,7 @@ document.addEventListener("DOMContentLoaded", async () => {
           type: "moddal",
           description: packet.data
         })
-      } else if (packet.type === "notify") {
+      } else if (packet.type === "notify2") {
         console.log("HTML", packet.data)
         if (packet.data) {
           let payload = {}
@@ -240,9 +240,20 @@ document.addEventListener("DOMContentLoaded", async () => {
           if (packet.data.type) {
             payload.type = packet.data.type
           }
-//          n.Noty(payload)
           document.querySelector("#status-screen").innerHTML = packet.data.html
         }
+      } else if (packet.type === "notify") {
+        console.log("HTML", packet.data)
+        if (packet.data) {
+          let payload = {}
+          if (packet.data.html) {
+            payload.text = packet.data.html
+          }
+          if (packet.data.type) {
+            payload.type = packet.data.type
+          }
+          n.Noty(payload)
+        }
       }
     })
   })