pinokiod 3.6.1 → 3.6.3

package/kernel/api/index.js

@@ -1162,6 +1162,9 @@ class Api {
 //    let keypath = path.resolve(this.kernel.homedir, "key.json")
 //    this.kernel.keys = (await this.loader.load(keypath)).resolved
 
+    // init shell before running just to make sure the environment variables are fresh
+    await this.kernel.shell.init()
+
     if (request.uri){
       this.counter++;
       // API Call

package/kernel/bin/ffmpeg.js

@@ -7,7 +7,7 @@ class Ffmpeg {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        "conda install -y -c conda-forge ffmpeg",
+        "conda install -y -c conda-forge ffmpeg=7.0.2",
       ]
 //      conda: {
 //        name: "base",

package/kernel/bin/py.js

@@ -2,7 +2,6 @@ const fse = require('fs-extra')
 const path = require('path')
 class Py {
   async install(req, ondata) {
-    // set the permission
     await fse.remove(this.kernel.path('bin/py'))
     await this.kernel.exec({
       message: "git clone https://github.com/pinokiocomputer/python py",

package/package.json

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

package/server/index.js

@@ -489,9 +489,10 @@ class Server {
       }, {
         name: "node",
       }, {
-        type: "conda",
         name: "ffmpeg",
-        args: "-c conda-forge"
+//        type: "conda",
+//        name: "ffmpeg",
+//        args: "-c conda-forge"
       }]
       let platform = os.platform()
       if (platform === "win32") {
@@ -777,9 +778,10 @@ class Server {
         }, {
           name: "node",
         }, {
-          type: "conda",
           name: "ffmpeg",
-          args: "-c conda-forge"
+//          type: "conda",
+//          name: "ffmpeg",
+//          args: "-c conda-forge"
         }]
         let platform = os.platform()
         if (platform === "win32") {
@@ -2098,9 +2100,7 @@ class Server {
 
     // determine port if port is not passed in
 
-    if (options && options.port) {
-      this.port = options.port
-    } else {
+    if (!this.port) {
       this.port = 42000
 //      let platform = os.platform()
 //      if (platform === 'linux') {