pinokiod 3.9.0 → 3.9.3

package/kernel/bin/git.js

@@ -4,43 +4,69 @@ const fetch = require('cross-fetch')
 const { rimraf } = require('rimraf')
 const path = require("path")
 class Git {
+  cmd() {
+    if (this.kernel.platform === "darwin") {
+      return "git git-lfs"
+    } else {
+      return "git git-lfs gh"
+    }
+  }
   async install(req, ondata) {
-    await this.kernel.bin.exec({
-      message: [
-        "conda clean -y --all",
-        "conda install --no-shortcuts -y -c conda-forge git git-lfs"
-      ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
-    }, ondata)
-    if (this.kernel.platform === 'win32') {
-      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-      // check if gitconfig exists
-      let exists = await this.kernel.api.exists(gitconfig_path)
-      // if not, create one
-      if (!exists) {
-        await fs.promises.copyFile(
-          path.resolve(__dirname, "..", "gitconfig_template"),
-          gitconfig_path
-        )
-      }
+    if (this.kernel.platform === "darwin") {
+      await this.kernel.bin.exec({
+        conda: { skip: true },
+        message: "brew install gh",
+      }, ondata)
+    } else {
+      await this.kernel.bin.exec({
+        message: [
+          "conda clean -y --all",
+          `conda install -y -c conda-forge ${this.cmd()}`
+        ]
+      }, ondata)
     }
+    await fs.promises.mkdir(this.kernel.path("config/gh"), { recursive: true }).catch((e) => { })
+//    if (this.kernel.platform === 'win32') {
+//      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+//      // check if gitconfig exists
+//      let exists = await this.kernel.api.exists(gitconfig_path)
+//      // if not, create one
+//      if (!exists) {
+//        await fs.promises.copyFile(
+//          path.resolve(__dirname, "..", "gitconfig_template"),
+//          gitconfig_path
+//        )
+//      }
+//    }
   }
   async installed() {
-    return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")
+    if (this.kernel.platform === "darwin") {
+      let gh_config_exists = await this.kernel.exists("config/gh")
+      console.log("conda installed", this.kernel.bin.installed.conda)
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.brew.has("gh") && gh_config_exists
+    } else {
+      let gh_config_exists = await this.kernel.exists("config/gh")
+      console.log("conda installed", this.kernel.bin.installed.conda)
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && gh_config_exists
+    }
   }
   async uninstall(req, ondata) {
-    await this.kernel.bin.exec({ message: "conda remove git" }, ondata)
+    if (this.kernel.platform === "darwin") {
+      await this.kernel.bin.exec({ message: "conda remove git" }, ondata)
+      await this.kernel.bin.exec({
+        conda: { skip: true },
+        message: "brew uninstall gh",
+      })
+    } else {
+      await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
+    }
   }
   env() {
-//    if (this.kernel.platform === 'win32') {
-      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-      return {
-        GIT_CONFIG_GLOBAL: gitconfig_path
-      }
-//    }
+    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+    return {
+      GIT_CONFIG_GLOBAL: gitconfig_path,
+      GH_CONFIG_DIR: this.kernel.path("config/gh")
+    }
   }
   async requires() {
     return ["conda"]

package/kernel/bin/gxx.js

@@ -1,15 +1,17 @@
 class GXX {
+  cmd() {
+    if (this.kernel.platform === "linux") {
+      return "'gxx<12'"
+    } else {
+      return ""
+    }
+  }
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      //message: "conda install -y nodejs=22.12.0 -c conda-forge"
       message: [
         "conda clean -y --all",
-        "conda install -y -c conda-forge 'gxx<12'"
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/huggingface.js

@@ -1,14 +1,13 @@
 class Huggingface {
+  cmd() {
+    return "huggingface_hub"
+  }
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        "conda install -y -c conda-forge huggingface_hub"
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
     }, ondata)
   }
   async installed() {