From bb6213e20356c3b3135b96ef2020cef1b523b9a3 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 8 Jun 2015 01:03:16 +0400 Subject: [PATCH 1/2] set node_path via fsOptions --- node_modules/vfs-local/localfs.js | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index 9d7e2f0c..2118d6af 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -65,9 +65,14 @@ function logToFile(message){ module.exports = function setup(fsOptions) { var pty; + if (fsOptions.nodePath) { + process.env.NODE_PATH = fsOptions.nodePath; + require("module")._initPaths(); + } if (!fsOptions.nopty) { // on darwin trying to load binary for a wrong version crashes the process - [process.env.HOME + "/.c9/node_modules/pty.js", "pty.js", "pty.nw.js"].some(function(p) { + [(fsOptions.nodePath || process.env.HOME + "/.c9/node_modules") + "/pty.js", + "pty.js", "pty.nw.js"].some(function(p) { try { pty = require(p); return true; diff --git a/package.json b/package.json index 65bce44d..e1e0734a 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.tern": "#2b0bb024da", "c9.ide.language.javascript.infer": "#cfec494a3c", "c9.ide.language.jsonalyzer": "#ba3e0d298c", - "c9.ide.collab": "#532e8d7b5d", + "c9.ide.collab": "#d978678519", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#6cc6d3379d", "c9.ide.find.infiles": "#72582de3cd", From 9941f29776cae9fd5d9b85ff85640f1f27cf94fd Mon Sep 17 00:00:00 2001 From: nightwing Date: Fri, 12 Jun 2015 15:31:35 +0400 Subject: [PATCH 2/2] do not rely on nodePath having a trailing slash --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1e0734a..ba771ee0 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.tern": "#2b0bb024da", "c9.ide.language.javascript.infer": "#cfec494a3c", "c9.ide.language.jsonalyzer": "#ba3e0d298c", - "c9.ide.collab": "#d978678519", + "c9.ide.collab": "#38c07e1665", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#6cc6d3379d", "c9.ide.find.infiles": "#72582de3cd",