pinokiod 3.5.6 → 3.5.8

package/kernel/bin/conda.js

@@ -197,7 +197,7 @@ report_errors: false`)
     }
     ondata({ raw: `${cmd}\r\n` })
     ondata({ raw: `path: ${this.kernel.bin.path()}\r\n` })
-    await this.kernel.bin.exec({ message: cmd, conda: { skip: true } }, (stream) => {
+    await this.kernel.bin.exec({ message: cmd, vs: { skip: true }, conda: { skip: true } }, (stream) => {
       ondata(stream)
     })
 

package/kernel/shell.js

@@ -672,39 +672,43 @@ class Shell {
 
 
     if (this.platform === "win32") {
-      try {
-        let vcvars_path = this.kernel.bin.vs_path_env.VCVARSALL_PATH
-        if (vcvars_path) {
-          const architecture = os.arch().toLowerCase();  // 'x64', 'ia32' (32-bit), etc.
-          const armArchitecture = process.arch.toLowerCase(); // For ARM-based architectures (on Windows), process.arch might be 'arm64', 'arm', etc.
-
-          // Map architectures to vcvarsall.bat argument
-          let arg
-          if (architecture === 'x64' || armArchitecture === 'arm64') {
-            //arg = 'amd64';  // Native 64-bit architecture
-            arg = 'x64';
-          } else if (architecture === 'ia32' || armArchitecture === 'arm') {
-            arg = 'x86';    // Native 32-bit architecture
-          } else if (armArchitecture === 'x86_arm64') {
-            arg = 'x86_arm64';  // ARM64 on x86
-          } else if (armArchitecture === 'x86_arm') {
-            arg = 'x86_arm';    // ARM on x86
-          } else if (armArchitecture === 'amd64_arm64') {
-            arg = 'amd64_arm64'; // ARM64 on x64
-          } else if (armArchitecture === 'amd64_arm') {
-            arg = 'amd64_arm';   // ARM on x64
-          } else {
-            console.log(`Unsupported arch: os.arch()=${architecture}, process.arch=${armArchitecture}`)
-          }
+      if (params.vs && params.vs.skip) {
+        console.log("Skip VSVARSALL")
+      } else {
+        try {
+          let vcvars_path = this.kernel.bin.vs_path_env.VCVARSALL_PATH
+          if (vcvars_path) {
+            const architecture = os.arch().toLowerCase();  // 'x64', 'ia32' (32-bit), etc.
+            const armArchitecture = process.arch.toLowerCase(); // For ARM-based architectures (on Windows), process.arch might be 'arm64', 'arm', etc.
+
+            // Map architectures to vcvarsall.bat argument
+            let arg
+            if (architecture === 'x64' || armArchitecture === 'arm64') {
+              //arg = 'amd64';  // Native 64-bit architecture
+              arg = 'x64';
+            } else if (architecture === 'ia32' || armArchitecture === 'arm') {
+              arg = 'x86';    // Native 32-bit architecture
+            } else if (armArchitecture === 'x86_arm64') {
+              arg = 'x86_arm64';  // ARM64 on x86
+            } else if (armArchitecture === 'x86_arm') {
+              arg = 'x86_arm';    // ARM on x86
+            } else if (armArchitecture === 'amd64_arm64') {
+              arg = 'amd64_arm64'; // ARM64 on x64
+            } else if (armArchitecture === 'amd64_arm') {
+              arg = 'amd64_arm';   // ARM on x64
+            } else {
+              console.log(`Unsupported arch: os.arch()=${architecture}, process.arch=${armArchitecture}`)
+            }
 
-          if (arg) {
-            conda_activation.push(`"${vcvars_path}" ${arg} > nul 2>&1`)
+            if (arg) {
+              conda_activation.push(`"${vcvars_path}" ${arg} > nul 2>&1`)
+            }
+          } else {
+  //          console.log('vc vars env doesnt exist')
           }
-        } else {
-//          console.log('vc vars env doesnt exist')
+        } catch (e) {
+          console.log('vc vars setup', e)
         }
-      } catch (e) {
-        console.log('vc vars setup', e)
       }
 
 //      const vs_path_env = this.kernel.bin.vs_path_env

package/package.json

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