mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request +7617 from c9/fix/localfs 

Set NODE_PATH via fsOptions
pull/117/merge
Lennart Kats 2015-06-12 13:59:41 +02:00
rodzic 0e2b7bc330 9941f29776
commit ef01bb068d
2 zmienionych plików z 7 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
node_modules/vfs-local/localfs.js wygenerowano vendored
Wyświetl plik

@ -65,9 +65,14 @@ function logToFile(message){
module.exports = function setup(fsOptions) { module.exports = function setup(fsOptions) {
var pty; var pty;
if (fsOptions.nodePath) {
process.env.NODE_PATH = fsOptions.nodePath;
require("module")._initPaths();
}
if (!fsOptions.nopty) { if (!fsOptions.nopty) {
// on darwin trying to load binary for a wrong version crashes the process // 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 { try {
pty = require(p); pty = require(p);
return true; return true;

2
package.json
Wyświetl plik

@ -67,7 +67,7 @@
"c9.ide.language.javascript.tern": "#2b0bb024da", "c9.ide.language.javascript.tern": "#2b0bb024da",
"c9.ide.language.javascript.infer": "#cfec494a3c", "c9.ide.language.javascript.infer": "#cfec494a3c",
"c9.ide.language.jsonalyzer": "#ba3e0d298c", "c9.ide.language.jsonalyzer": "#ba3e0d298c",
"c9.ide.collab": "#a228af3bc9", "c9.ide.collab": "#f38dcd432e",
"c9.ide.local": "#a9703b630c", "c9.ide.local": "#a9703b630c",
"c9.ide.find": "#6cc6d3379d", "c9.ide.find": "#6cc6d3379d",
"c9.ide.find.infiles": "#72582de3cd", "c9.ide.find.infiles": "#72582de3cd",