pinokiod 2.1.10 → 2.1.12

package/kernel/bin/index.js

@@ -328,6 +328,16 @@ class Bin {
         }
       }
       this.installed.brew = new Set(brew)
+
+
+      // check brew_installed
+      console.log("checking brew installed")
+      let e = await this.kernel.bin.exists("homebrew")
+      let { stdout }= await this.kernel.bin.exec({ message: "xcode-select -p" }, (stream) => { })
+      let e2 = /(.*Library.*Developer.*CommandLineTools.*|.*Xcode.*Developer.*)/gi.test(stdout)
+      console.log({ e, e2, stdout })
+      this.brew_installed = e && e2
+
     }
 
 //    /// B. base path initialization
@@ -350,13 +360,6 @@ class Bin {
 
     console.log("this.installed", this.installed)
 
-    // check brew_installed
-    console.log("checking brew installed")
-    let e = await this.kernel.bin.exists("homebrew")
-    let { stdout }= await this.kernel.bin.exec({ message: "xcode-select -p" }, (stream) => { })
-    let e2 = /(.*Library.*Developer.*CommandLineTools.*|.*Xcode.*Developer.*)/gi.test(stdout)
-    console.log({ e, e2, stdout })
-    this.brew_installed = e && e2
 
 
     this.installed_initialized = true

package/kernel/environment.js

@@ -78,7 +78,7 @@ const ENVS = async () => {
     type: ["system"],
     key: "PS1",
     hidden: true,
-    val: "<<PINOKIO SHELL>> "
+    val: "<<PINOKIO_SHELL>> "
   }, {
     type: ["system"],
     key: "GRADIO_ANALYTICS_ENABLED",
@@ -283,11 +283,23 @@ const ENVS = async () => {
 // type := system|app
 const ENV = async (type, homedir) => {
   const envs = await ENVS()
-  let filtered_envs = envs.filter((e) => {
-    return e.type.includes(type)
-  })
+  let filtered_envs = []
+  let irrelevant_keys = []
+  for(let e of envs) {
+    if (e.type.includes(type)) {
+      filtered_envs.push(e)
+    } else {
+      irrelevant_keys.push(e.key)
+    }
+  }
+
+//  let filtered_envs = envs.filter((e) => {
+//    return e.type.includes(type)
+//  })
 
   let lines = []
+  let system_env
+  let keys = new Set()
   for(let e of filtered_envs) {
     let comment = ""
     if (e.comment && Array.isArray(e.comment)) {
@@ -305,17 +317,40 @@ const ENV = async (type, homedir) => {
     //  if e.key exists on system env, use that
     //  if e.key does NOT exist on system env, 
     if (type === 'app') {
-      let system_env = await get(homedir)
+      system_env = await get(homedir)
       if (e.key in system_env) {
         console.log(`original ${e.key}=${val}`)
         val = system_env[e.key]
         console.log(`inherited from system_env: ${e.key}=${val}`)
+        keys.add(e.key)
       }
     }
 
     let kv = `${e.key}=${val}`
+    console.log("kv", kv)
     lines.push(comment+kv)
   }
+
+// In case of type: app, inherit any other custom ENVIRONMENT variable not yet included
+console.log({ irrelevant_keys })
+if (type === "app" && system_env) {
+  for(let key in system_env) {
+    if (!keys.has(key)) {
+      // the key has not been processed, need to add to the lines
+      if (irrelevant_keys.includes(key)) {
+        // if the key was explicitly stated to be not included, skip
+        console.log("irrelevant key", key)
+      } else {
+        console.log("relevant key", key)
+        let val = system_env[key]
+        let kv = `${key}=${val}`
+        lines.push(kv)
+        console.log(`inherited custom environment key from system_env: ${kv}`)
+      }
+    }
+  }
+}
+
   return lines.join("\n")
 }
 const init_folders = async (homedir) => {

package/kernel/sysinfo.js

@@ -16,7 +16,7 @@ class Sysinfo {
 //    await this.disk()
   }
   async refresh() {
-    await this.time()
+//    await this.time()
     await this.memory()
     await this.battery()
     await this.proc()
@@ -54,9 +54,9 @@ class Sysinfo {
     this.info.gpu = gpu
 
   }
-  async time() {
-    this.info.time = await system.time()
-  }
+//  async time() {
+//    this.info.time = await system.time()
+//  }
   async system() {
     this.info.system = await system.system()
   }

package/kernel/util.js

@@ -95,10 +95,12 @@ const update_env = async (filepath, changes) => {
     .replace(returnPattern, returnReplacement)
     .trim();
     const safeName = escapeStringRegexp(varname);
-    const varPattern = new RegExp(`^(${h}*${safeName}${h}*=${h}*)\\S*(${h}*)$`, "gm");
+    //const varPattern = new RegExp(`^(${h}*${safeName}${h}*=${h}*)\\S*(${h}*)$`, "gm");
+    const varPattern = new RegExp(`^(${h}*${safeName}${h}*=${h}*)(\\S(?:.*\\S)?)?(${h}*)$`, "gm");
     if (varPattern.test(result)) {
       const safeValue = value.replace(groupPattern, groupReplacement);
-      return result.replace(varPattern, `$1${safeValue}$2`);
+      //return result.replace(varPattern, `$1${safeValue}$2`);
+      return result.replace(varPattern, `$1${safeValue}$3`);
     } else if (result === "") {
       append = true;
       return `${varname}=${value}${EOL}`;

package/package.json

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

package/server/index.js

@@ -459,9 +459,10 @@ class Server {
         install_required = false
         for(let i=0; i<requirements.length; i++) {
           let r = requirements[i]
-          console.log("r", r)
+          console.time(r.name)
           let installed = await this.installed(r)
-          console.log("installed", installed)
+          console.log({ r, installed })
+          console.timeEnd(r.name)
           requirements[i].installed = installed
           if (!installed) {
             install_required = true

package/server/views/500.ejs

@@ -3,7 +3,6 @@
 <style>
 body {
   width: 100%;
-  height: 100%;
   margin: 0;
   background: royalblue;
   color: white;
@@ -41,9 +40,9 @@ footer a {
 <footer>
   <div>You may want to try:</div>
   <ol>
-    <li>Update to the latest version of Pinokio: <a href="https://program.pinokio.computer/#/?id=install" target="_blank">https://program.pinokio.computer/#/?id=install</a></li>
+    <li>Update Pinokio: Simply install the latest version, it should only update the app binary while keeping all the data in tact. <a href="https://program.pinokio.computer/#/?id=install" target="_blank">Go to Download Page</a></li>
     <li>Try troubleshooting: <a href="/?mode=settings#troubleshoot">Troubleshoot</a></li>
-    <li>Ask in community Discord: <a href="https://discord.gg/TQdNwadtE4" target="_blank">Discord</a></li>
+    <li>Ask in community Discord: <a href="http://localhost/?mode=help" target="_blank">Community</a></li>
   </ol>
 </footer>
 </body>