pinokiod 3.321.0 → 3.323.0

package/kernel/bin/git.js

@@ -6,11 +6,12 @@ const path = require("path")
 class Git {
   cmd() {
     if (this.kernel.platform === "darwin") {
-      return "git git-lfs gh=2.82.1"
+      return "git=2.51.0 git-lfs gh=2.82.1"
     } else if (this.kernel.platform === "win32") {
-      return "git git-lfs gh=2.82.1 git-bash"
+      //return "git git-lfs gh=2.82.1 git-bash"
+      return "git=2.51.0 git-lfs gh=2.82.1 m2-base"
     } else {
-      return "git git-lfs gh=2.82.1"
+      return "git=2.51.0 git-lfs gh=2.82.1"
     }
   }
   async install(req, ondata) {
@@ -23,10 +24,21 @@ class Git {
     }, ondata)
   }
   async installed() {
+    let version = this.kernel.bin.installed.conda_versions.git
+    console.log("git version", version)
+    let coerced = semver.coerce(version)
+    console.log("git coerced", coerced)
+    let requirement = ">=2.51.0"
+    let satisfied = semver.satisfies(coerced, requirement)
+    console.log("git version satisfied?", satisfied)
+    if (!satisfied) {
+      return false 
+    }
     if (this.kernel.platform === "darwin") {
       return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
     } else if (this.kernel.platform === "win32") {
-      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && this.kernel.bin.installed.conda.has("git-bash")
+      //return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && this.kernel.bin.installed.conda.has("git-bash")
+      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && this.kernel.bin.installed.conda.has("m2-base")
     } else {
       return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
     }

package/kernel/gitconfig_template

@@ -11,7 +11,7 @@
   required = true
 [user]
   name = pinokio
-  email = pinokio
+  email = pinokio@localhost
 [init]
   defaultBranch = main
 [push]

package/package.json

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

package/server/index.js

@@ -182,6 +182,9 @@ class Server {
   async ensureGitconfigDefaults(home) {
     const gitconfigPath = path.resolve(home, "gitconfig")
     const templatePath = path.resolve(__dirname, "..", "kernel", "gitconfig_template")
+    const defaultName = "pinokio"
+    const defaultEmail = "pinokio@localhost"
+    const hasEmailShape = (value) => typeof value === "string" && value.includes("@")
     const required = [
       { section: "init", key: "defaultBranch", value: "main" },
       { section: "push", key: "autoSetupRemote", value: true },
@@ -214,6 +217,23 @@ class Server {
       }
     }
 
+    if (!config.user) {
+      config.user = {}
+    }
+    const name = (typeof config.user.name === "string") ? config.user.name : ""
+    if (!name.trim()) {
+      config.user.name = defaultName
+      dirty = true
+    }
+    const email = (typeof config.user.email === "string") ? config.user.email.trim() : ""
+    if (!hasEmailShape(email)) {
+      config.user.email = defaultEmail
+      dirty = true
+    } else if (email !== config.user.email) {
+      config.user.email = email
+      dirty = true
+    }
+
     if (dirty) {
       await fs.promises.writeFile(gitconfigPath, ini.stringify(config))
     }