pinokiod 3.2.82 → 3.2.84

package/kernel/bin/aria2.js

@@ -17,7 +17,7 @@ class Aria2 {
       await this.kernel.bin.download(url, dest, ondata)
       await this.kernel.bin.unzip(dest, "aria2", ondata)
     } else {
-      await this.kernel.bin.exec({ message: "conda install -y -c conda-forge aria2", conda: { name: "base", activate: "minimal"} }, ondata)
+      await this.kernel.bin.exec({ message: "conda install -y -c conda-forge aria2" }, ondata)
     }
   }
   async installed() {

package/kernel/bin/brew.js

@@ -19,19 +19,48 @@ class Brew {
     await this.kernel.bin.rm("Homebrew.zip", ondata)
 
     if (this.kernel.platform === "darwin") {
-      await this.kernel.bin.exec({ sudo: true, conda: { skip: true }, message: "rm -rf /Library/Developer/CommandLineTools" }, (stream) => { ondata(stream) })
-      await this.kernel.bin.exec({ message: "xcode-select --install", conda: { skip: true } }, (stream) => { ondata(stream) })
+      // command line tools
+      let e4;
+      let result = await this.kernel.bin.exec({ message: "xcode-select --version" }, (stream) => { })
+      if (result && result.stdout) {
+        e4 = /xcode-select version ([0-9]+)/gi.exec(result.stdout)
+        if (e4.length > 1) {
+          let version = Number(e4[1]) 
+          console.log("xcode-select version", version)
+          if (version >= 2349) {
+            e4 = true
+          } else {
+            e4 = false
+          }
+        } else {
+          e4 = false
+        }
+      } else {
+        e4 = false
+      }
 
-      let sh_path = path.resolve(this.kernel.homedir, "xcode.sh")
-      let src_path = path.resolve(__dirname, "xcode.sh")
-      console.log({ sh_path, src_path })
-      let sh = await fs.promises.readFile(src_path, "utf8")
-      console.log({ sh })
-      await fs.promises.writeFile(sh_path, sh)
-      await this.kernel.bin.exec({ message: "bash ./xcode.sh", path: this.kernel.homedir, conda: { skip: true }}, (stream) => { ondata(stream) })
+      console.log("> e4", e4)
+
+      if (!e4) {
+        console.log("install the latest xcode build tools")
+        // not installed or not installed properly
+        // install xcode build tools
+        await this.kernel.bin.exec({ sudo: true, conda: { skip: true }, message: "rm -rf /Library/Developer/CommandLineTools" }, (stream) => { ondata(stream) })
+        let sh_path = path.resolve(this.kernel.homedir, "xcode.sh")
+        let src_path = path.resolve(__dirname, "xcode.sh")
+        console.log({ sh_path, src_path })
+        let sh = await fs.promises.readFile(src_path, "utf8")
+        console.log({ sh })
+        await fs.promises.writeFile(sh_path, sh)
+        await this.kernel.bin.exec({ message: "bash ./xcode.sh", path: this.kernel.homedir, conda: { skip: true }}, (stream) => { ondata(stream) })
+
+        ondata({ raw: "installing xcode-select. please approve the xcode-select install dialog and install before proceeding...\r\n" })
+        await this.kernel.bin.exec({ message: "xcode-select --install", conda: { skip: true } }, (stream) => { ondata(stream) })
+
+      } else {
+        console.log("no need to install xcode build tools")
+      }
 
-      ondata({ raw: "installing xcode-select. please approve the xcode-select install dialog and install before proceeding...\r\n" })
-      await this.kernel.bin.exec({ message: "xcode-select --install", conda: { skip: true } }, (stream) => { ondata(stream) })
 
       //ondata({ raw: "Setting CommandLineTools path...\r\n" })
       //await this.kernel.bin.exec({ sudo: true, message: "xcode-select -switch /Library/Developer/CommandLineTools" }, (stream) => { ondata(stream) })

package/kernel/bin/conda.js

@@ -133,10 +133,10 @@ conda-libmamba-solver=24.7.0`)
 
     await this.kernel.bin.exec({
       message: cmds,
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
 //      [
 //        (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
 //        (this.platform === 'win32' ? `activate base` : `conda activate base`),

package/kernel/bin/cuda.js

@@ -3,32 +3,32 @@ class Cuda {
     if (this.kernel.platform === "win32") {
       await this.kernel.bin.exec({
         message: "conda install -y cudnn libzlib-wapi -c conda-forge",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
       await this.kernel.bin.exec({
         message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
     } else {
       await this.kernel.bin.exec({
         message: "conda install -y cudnn -c conda-forge",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
       await this.kernel.bin.exec({
         message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
     }
   }

package/kernel/bin/ffmpeg.js

@@ -6,10 +6,10 @@ class Ffmpeg {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install -y -c conda-forge ffmpeg",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/git.js

@@ -7,10 +7,10 @@ class Git {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install --no-shortcuts -y -c conda-forge git git-lfs",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
     if (this.kernel.platform === 'win32') {
       let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")

package/kernel/bin/huggingface.js

@@ -2,10 +2,10 @@ class Huggingface {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install -y -c conda-forge huggingface_hub",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/llvm.js

@@ -5,10 +5,10 @@ class LLVM {
     } else {
       await bin.exec({
         message: "conda install -y -c conda-forge llvm",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
     }
   }

package/kernel/bin/node.js

@@ -7,10 +7,10 @@ class Node {
     await this.kernel.bin.exec({
       //message: "conda install -y nodejs=22.12.0 -c conda-forge"
       message: "conda install -y nodejs=20.17.0 -c conda-forge",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/uv.js

@@ -6,10 +6,10 @@ class UV {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install -y -c conda-forge uv",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/zip.js

@@ -8,10 +8,10 @@ class Zip {
     }
     await this.kernel.bin.exec({
       message: cmd,
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/package.json

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