pinokiod 1.3.11 → 1.3.13

package/kernel/api/index.js

@@ -539,7 +539,6 @@ class Api {
     // 1. render once
     let rpc = rawrpc
     let pass = 0;
-    console.log("Render", { rpc, memory })
     while(true) {
       rpc = this.kernel.template.render(rpc, memory)
       if (this.kernel.template.istemplate(rpc)) {

package/kernel/bin/conda.js

@@ -73,7 +73,7 @@ class Conda {
       message: [
 //        (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
 //        (this.platform === 'win32' ? `activate base` : `conda activate base`),
-        "conda config --add create_default_packages python=3.10",
+        `conda config --file ${this.kernel.bin.path('miniconda', 'condarc')} --add create_default_packages python=3.10`,
         //"conda update -y conda",
         "conda update -y --all",
         // handling the conda-libmamba-solver bug here: https://github.com/conda/conda-libmamba-solver/issues/283

package/kernel/shell.js

@@ -125,6 +125,7 @@ class Shell {
     this.env.XDG_STATE_HOME = path.resolve(this.kernel.homedir, "cache", "XDG_STATE_HOME")
     this.env.GRADIO_TEMP_DIR = path.resolve(this.kernel.homedir, "cache", "GRADIO_TEMP_DIR")
     this.env.PIP_CONFIG_FILE = path.resolve(this.kernel.homedir, "pipconfig")
+    this.env.CONDARC = path.resolve(this.kernel.homedir, "bin", "miniconda", "condarc")
 
     this.env.PS1 = "<<PINOKIO SHELL>> "
 //    this.env.PROMPT_COMMAND = "export PS1=\"<<PINOKIO SHELL>> \""
@@ -147,8 +148,6 @@ class Shell {
     }
     // custom env was passed in
 
-    console.log("params", params)
-
     // override cache folders if cache is specified
     if (params.cache) {
       // cache data files
@@ -168,7 +167,6 @@ class Shell {
       ]
       for(let type of types) {
         let p = path.resolve(cache_path, type)
-        console.log("setting", p)
         this.env[type] = p
         await fs.promises.mkdir(p, { recursive: true }).catch((e) => { })
       }
@@ -232,7 +230,6 @@ class Shell {
     // automatically add self to the shells registry
     this.kernel.shell.add(this)
 
-    console.log("params", params)
     if (params.sudo) {
       let options = {
         name: "Pinokio",

package/package.json

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

package/server/views/settings.ejs

@@ -395,30 +395,32 @@ document.addEventListener("DOMContentLoaded", async () => {
     })
   <% } %>
   <% if (agent === "electron") { %>
-    document.querySelector("#del-browser-cache").addEventListener("click", async (e) => {
-      console.log("del-browser-cache")
-      let proceed = confirm("Are you sure you wish to delete the browser cache? This will remove all cookies and site data")
-      if (proceed) {
-        document.querySelector(".reset-browser-cache-loading").classList.remove("hidden")
-        document.querySelector("#del-browser-cache").classList.add("hidden")
-        let res = await fetch("/pinokio/delete", {
-          method: "post",
-          headers: {
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({ type: "browser-cache" })
-        }).then((res) => {
-          return res.json()
-        })
-        console.log(res)
-        document.querySelector(".reset-browser-cache-loading").classList.add("hidden")
-        if (res.error) {
-          alert(res.error)
-        } else {
-          location.href = location.href
+    if (document.querySelector("#del-browser-cache")) {
+      document.querySelector("#del-browser-cache").addEventListener("click", async (e) => {
+        console.log("del-browser-cache")
+        let proceed = confirm("Are you sure you wish to delete the browser cache? This will remove all cookies and site data")
+        if (proceed) {
+          document.querySelector(".reset-browser-cache-loading").classList.remove("hidden")
+          document.querySelector("#del-browser-cache").classList.add("hidden")
+          let res = await fetch("/pinokio/delete", {
+            method: "post",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({ type: "browser-cache" })
+          }).then((res) => {
+            return res.json()
+          })
+          console.log(res)
+          document.querySelector(".reset-browser-cache-loading").classList.add("hidden")
+          if (res.error) {
+            alert(res.error)
+          } else {
+            location.href = location.href
+          }
         }
-      }
-    })
+      })
+    }
   <% } %>
   document.querySelector("form").addEventListener("submit", async (e) => {
     e.preventDefault()