pinokiod 3.3.49 → 3.3.52

package/kernel/bin/vs.js

@@ -117,7 +117,7 @@ class VS {
           }
         }
       }
-      console.log("vs.init() this._env=", this.env)
+      console.log("vs.init() this._env=", this._env)
     }
   }
   env () {
@@ -127,10 +127,9 @@ class VS {
   }
   async installed() {
     if (this.kernel.platform === "win32") {
-      let paths = await this.getpaths()
-      console.log("VS INSTALLED CHECK", paths)
       await this.init()
-      return paths.MSVC_PATH && paths.MSVC_PATH.length > 0 && paths.BUILD_PATH && paths.BUILD_PATH.length > 0 && paths.CMAKE_PATH && paths.CMAKE_PATH.length > 0 && paths.VCVARSALL_PATH && paths.VCVARSALL_PATH.length > 0
+      console.log("VS INSTALLED CHECK", this._env)
+      return this._env.MSVC_PATH && this._env.MSVC_PATH.length > 0 && this._env.BUILD_PATH && this._env.BUILD_PATH.length > 0 && this._env.CMAKE_PATH && this._env.CMAKE_PATH.length > 0 && this._env.VCVARSALL_PATH && this._env.VCVARSALL_PATH.length > 0
     }
   }
 

package/kernel/index.js

@@ -351,6 +351,25 @@ class Kernel {
       })
     }
   }
+  which(name) {
+    console.log("which", this.envs.PATH)
+    if (this.platform === "win32") {
+      try {
+        const result = execSync(`where ${name}`, { env: this.envs, encoding: "utf-8" })
+        const lines = result.trim().split("\r\n")
+        if (lines.length > 0) {
+          return lines[0]
+        } else {
+          return null
+        }
+      } catch (e) {
+        console.log(`>> which ${name}`, e)
+        return null
+      }
+    } else {
+      return which.sync(name, { nothrow: true, path: this.envs.PATH })
+    }
+  }
 
   async init(options) {
     let home = this.store.get("home")

package/kernel/shell.js

@@ -156,7 +156,11 @@ class Shell {
     }
 
     if (this.platform === "linux") {
-      this.env.NVCC_PREPEND_FLAGS = "-ccbin {{which('g++')}}"
+      let gxx = this.kernel.which('g++')
+      console.log({ gxx })
+      if (gxx) {
+        this.env.NVCC_PREPEND_FLAGS = `-ccbin ${gxx}`
+      }
     }
 
     this.env[PATH_KEY] = this.env[PATH_KEY] + path.delimiter + path.resolve(this.kernel.homedir, 'bin')
@@ -221,6 +225,8 @@ class Shell {
     // automatically add self to the shells registry
     this.kernel.shell.add(this)
 
+    console.log("this.env", this.env)
+
     if (params.sudo) {
       let options = {
         name: "Pinokio",

package/package.json

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