diff --git a/bin/envjs b/bin/envjs index 7c4bfa7c..3683e3e7 100755 --- a/bin/envjs +++ b/bin/envjs @@ -14,6 +14,7 @@ fi case "$ENVJS_PLATFORM" in "node") + export NODE_PATH=.:${NODE_PATH} node envjs/node.js $@ ;; "rhino") diff --git a/envjs/node.js b/envjs/node.js index 0de6d5a2..d15b7e00 100644 --- a/envjs/node.js +++ b/envjs/node.js @@ -1,3 +1,5 @@ -require.paths.unshift('.'); +if(parseFloat(process.versions.node) < 0.5) { + require.paths.unshift('.'); +} require('envjs/platform/node'); require('envjs/window'); diff --git a/envjs/platform/node.js b/envjs/platform/node.js index 56d1f463..7729b444 100644 --- a/envjs/platform/node.js +++ b/envjs/platform/node.js @@ -60,7 +60,13 @@ function __extend__(a,b) { return a; } -var $print = require('sys').print; +var $print; +if(parseFloat(process.versions.node) < 0.5) { + $print = require('sys').print; +} else { + $print = require('util').print; +} + Envjs.log = function(msg){ console.log(msg+'\n\n'); diff --git a/src/platform/node-v8/console.js b/src/platform/node-v8/console.js index 71e645c6..8811254e 100644 --- a/src/platform/node-v8/console.js +++ b/src/platform/node-v8/console.js @@ -1,5 +1,10 @@ -var $print = require('sys').print; +var $print; +if(parseFloat(process.versions.node) < 0.5) { + $print = require('sys').print; +} else { + $print = require('util').print; +} Envjs.log = function(msg){ console.log(msg+'\n\n');