diff --git a/lib/server/appcache.js b/lib/server/appcache.js index d0e4c948..88e41e44 100644 --- a/lib/server/appcache.js +++ b/lib/server/appcache.js @@ -12,8 +12,10 @@ '# http://cloudcmd.io' + '\n'); var main = global.cloudcmd.main, - fs = main.fs, - Util = main.util, + DIR = '../', + + fs = require('fs'), + Util = require(DIR + 'util'), /* varible contain all watched file names * {name: true} diff --git a/lib/server/main.js b/lib/server/main.js index ea7167bb..491d187b 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -11,7 +11,7 @@ SLASH, ISWIN32, ext, - path, fs, zlib, url, CloudFunc, diffPatch, querystring, + path, zlib, url, CloudFunc, diffPatch, querystring, Config = { server : true, @@ -21,7 +21,6 @@ /* Native Modules*/ exports.child_process = require('child_process'), - exports.fs = fs = require('fs'), exports.http = require('http'), exports.https = require('https'), exports.path = path = require('path'), @@ -46,11 +45,6 @@ exports.rootrequire = rootrequire, exports.quietrequire = quietrequire, - /* compitability with old versions of node */ - exports.fs.exists = exports.fs.exists || exports.path.exists, - - /* Needed Modules */ - /* we can not use librequare here */ exports.util = Util = require(LIBDIR + UTIL), diff --git a/lib/server/rest.js b/lib/server/rest.js index 44473744..1a7ccd30 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -14,7 +14,7 @@ '# http://cloudcmd.io' + '\n'); var main = global.cloudcmd.main, - fs = main.fs, + fs = require('fs'), path = main.path, crypto = require('crypto'), Util = main.util,