pinokiod 3.2.21 → 3.2.23

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" }, ondata)
+      await this.kernel.bin.exec({ message: "conda install -y -c conda-forge aria2", conda: { name: "base", activate: "minimal"} }, ondata)
     }
   }
   async installed() {

package/kernel/bin/conda.js

@@ -117,11 +117,7 @@ create_default_packages:
       message: cmds,
       conda: {
         name: "base",
-        activate: [
-          (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-          'conda deactivate',
-          'conda activate base',
-        ]
+        activate: "minimal"
       }
 //      [
 //        (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),

package/kernel/bin/cuda.js

@@ -3,16 +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"
+        }
       }, ondata)
       await this.kernel.bin.exec({
         message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
+        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"
+        }
       }, ondata)
       await this.kernel.bin.exec({
         message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
+        conda: {
+          name: "base",
+          activate: "minimal"
+        }
       }, ondata)
     }
   }

package/kernel/bin/ffmpeg.js

@@ -6,6 +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"
+      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/git.js

@@ -5,7 +5,13 @@ const { rimraf } = require('rimraf')
 const path = require("path")
 class Git {
   async install(req, ondata) {
-    await this.kernel.bin.exec({ message: "conda install -y -c conda-forge git git-lfs" }, ondata)
+    await this.kernel.bin.exec({
+      message: "conda install -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

package/kernel/bin/huggingface.js

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

package/kernel/bin/llvm.js

@@ -3,7 +3,13 @@ class LLVM {
     if (this.kernel.platform === 'darwin') {
       await bin.exec({ message: "brew install llvm" }, ondata)
     } else {
-      await bin.exec({ message: "conda install -y -c conda-forge llvm" }, ondata)
+      await bin.exec({
+        message: "conda install -y -c conda-forge llvm",
+        conda: {
+          name: "base",
+          activate: "minimal"
+        }
+      }, ondata)
     }
   }
   async installed() {

package/kernel/bin/node.js

@@ -6,7 +6,11 @@ class Node {
   async install(req, ondata) {
     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"
+      message: "conda install -y nodejs=20.17.0 -c conda-forge",
+      conda: {
+        name: "base",
+        activate: "minimal"
+      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/uv.js

@@ -6,6 +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"
+      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/zip.js

@@ -6,7 +6,13 @@ class Zip {
     } else {
       cmd = "conda install -y -c conda-forge p7zip"
     }
-    await this.kernel.bin.exec({ message: cmd }, ondata)
+    await this.kernel.bin.exec({
+      message: cmd,
+      conda: {
+        name: "base",
+        activate: "minimal"
+      }
+    }, ondata)
   }
   async installed() {
     if (this.kernel.platform === 'win32') {

package/kernel/shell.js

@@ -537,7 +537,16 @@ class Shell {
 
     let conda_activation = []
     if (conda_activate) {
-      conda_activation = conda_activate
+      if (typeof conda_activate === "string") {
+        if (conda_activate === "minimal") {
+          conda_activation = [
+            (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            'conda activate base',
+          ]
+        }
+      } else if (Array.isArray(conda_activate)) {
+        conda_activation = conda_activate
+      }
     } else if (conda_path) {
       let env_path = path.resolve(params.path, conda_path)
       let env_exists = await this.exists(env_path)

package/package.json

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