Improve __dirname resolution

mixu · Apr 19, 2012 · 34445a8 · 34445a8
1 parent 9cfd86f
commit 34445a8
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -1,5 +1,6 @@
-var vm = require('vm');
+var vm = require('vm'),
-var path = require('path');
+    path = require('path'),
+    fs = require('fs');
 
 // From lib/module.js in the Node.js core (v.0.5.3)
 function stripBOM(content) {
@@ -12,18 +13,19 @@ function stripBOM(content) {
   return content;
 }
 
-function runInContext(filename, sandbox) {  
+function runInContext(filename, sandbox) {
-  var content = require('fs').readFileSync(require.resolve(filename), 'utf8');
+  var fullpath = require.resolve(filename),
+      content = fs.readFileSync(fullpath, 'utf8');
   // remove shebang
   content = stripBOM(content).replace(/^\#\!.*/, '');
 
-  // emulate require()  
+  // emulate require()
   for (var k in global) {
     sandbox[k] = global[k];
   }
   sandbox.require = require;
   sandbox.__filename = filename;
-  sandbox.__dirname = path.dirname(filename);
+  sandbox.__dirname = path.dirname(fullpath)+'/';
   sandbox.exports = {};
   sandbox.module = sandbox;
   sandbox.global = sandbox;