From 510863a4d52c092eec59772e267eb4069822fd1b Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 22 Aug 2014 04:31:22 -0400 Subject: [PATCH] feature(main) rm Util --- lib/server/main.js | 2 +- lib/server/rest.js | 9 +++++++-- lib/server/terminal.js | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/server/main.js b/lib/server/main.js index 2e18b870..c0bc93aa 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -37,7 +37,7 @@ exports.quietrequire = quietrequire, /* we can not use librequare here */ - exports.util = Util = require(LIBDIR + UTIL), + Util = require(LIBDIR + UTIL), /* Main Information */ exports.modules = jsonrequire('modules'); diff --git a/lib/server/rest.js b/lib/server/rest.js index e4caf9a6..ab2a89ba 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -14,10 +14,15 @@ '# http://cloudcmd.io' + '\n'); var main = global.cloudcmd.main, + + DIR = './', + DIR_LIB = DIR + '../', + fs = require('fs'), path = require('path'), crypto = require('crypto'), - Util = main.util, + + Util = require(DIR_LIB + 'util'), CloudFunc = main.cloudfunc, onFSGet = main.srvrequire('rest/fs/get').onGet, @@ -27,7 +32,7 @@ JSONDIR = main.JSONDIR, - DIR = './', + flop = require(DIR + 'flop'), pack = require(DIR + 'pack'), diff --git a/lib/server/terminal.js b/lib/server/terminal.js index 89db652f..f9f46c94 100644 --- a/lib/server/terminal.js +++ b/lib/server/terminal.js @@ -2,11 +2,13 @@ 'use strict'; var main = global.cloudcmd.main, - DIR = main.DIR, + DIR = __dirname + '/../../', + DIR_LIB = DIR + 'lib/', + socket = main.socket, pty = main.require('pty.js'), - Util = main.util, + Util = require(DIR_LIB + 'util'), CloudFunc = main.cloudfunc, Clients = [],