diff --git a/app.js b/app.js index c1bbef1..8f572d3 100644 --- a/app.js +++ b/app.js @@ -74,11 +74,22 @@ function require(FN) { if (FN.substr(FN.length - 3) !== '.js') FN += ".js"; if (cache[FN]) return cache[FN]; + // get current script directory + var getCurrentScriptDirectory = function() { + if(typeof(WScript) !== "undefined") { + var path = WScript.ScriptFullName; + var pos = path.lastIndexOf("\\"); + return path.substring(0, pos); + } else { + return "."; + } + }; + // load script file var FSO = CreateObject("Scripting.FileSystemObject"); var T = null; try { - var TS = FSO.OpenTextFile(FN, 1); + TS = FSO.OpenTextFile(getCurrentScriptDirectory() + "\\" + FN, 1); if (TS.AtEndOfStream) return ""; T = TS.ReadAll(); TS.Close(); diff --git a/lib/shell.js b/lib/shell.js index 767f90d..53e9853 100644 --- a/lib/shell.js +++ b/lib/shell.js @@ -2,7 +2,7 @@ // Shell API //////////////////////////////////////////////////////////////////////// -var FILE = require('lib/file'); +var FILE = require("lib/file"); exports.VERSIONINFO = "Shell Module (shell.js) version 0.1"; exports.global = global; diff --git a/lib/system.js b/lib/system.js index 9645999..15e68e0 100644 --- a/lib/system.js +++ b/lib/system.js @@ -101,9 +101,13 @@ exports.getCurrentWorkingDirectory = function() { // "console only"; exports.getCurrentScriptDirectory = function() { - var path = WScript.ScriptFullName; - var pos = path.lastIndexOf("\\"); - return path.substring(0, pos); + if(typeof(WScript) !== "undefined") { + var path = WScript.ScriptFullName; + var pos = path.lastIndexOf("\\"); + return path.substring(0, pos); + } else { + return "."; + } }; exports.getNetworkInterfaces = function() {