From 66ca7111a471ef9fd906c6789f02e19586ee8d16 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 8 Jul 2014 10:29:46 -0400 Subject: [PATCH] refactor(console) main -> require --- lib/server/console.js | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/server/console.js b/lib/server/console.js index d1991d1d..7ca12790 100644 --- a/lib/server/console.js +++ b/lib/server/console.js @@ -1,27 +1,31 @@ (function() { 'use strict'; - var main = global.cloudcmd.main, - - socket = main.socket, - update = main.srvrequire('update'), - DIR = '../', + var DIR = '../', + DIR_ROOT = DIR + '../', DIR_SERVER = './', - win = require(DIR_SERVER + 'win'), - exec = main.child_process.exec, - spawn = main.child_process.spawn, + path = require('path'), + child_process = require('child_process'), + exec = child_process.exec, + spawn = child_process.spawn, - Util = main.util, - path = main.path, - CloudFunc = main.cloudfunc, - mainpackage = main.mainpackage, - equalPart = Util.isContainStrAtBegin, + Util = require(DIR + 'util'), + CloudFunc = require(DIR + 'cloudfunc'), + + win = require(DIR_SERVER + 'win'), + update = require(DIR_SERVER + 'update'), + socket = require(DIR_SERVER + 'socket'), + + mainpackage = require(DIR_ROOT + 'package'), CLOUDCMD = mainpackage.name, + + equalPart = Util.isContainStrAtBegin, + ClientFuncs = [], ClientDirs = [], Clients = [], - WIN32 = main.WIN32, + WIN32 = process.platform === 'win32', addNewLine = CloudFunc.addNewLine,