From 8df7a8a019ac4a4271d19cb43e38330857ce2d66 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 15 Jun 2015 02:41:40 -0400 Subject: [PATCH] feature(config) add os.homedir --- lib/server/config.js | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/lib/server/config.js b/lib/server/config.js index e1d3a99b..77a0f782 100644 --- a/lib/server/config.js +++ b/lib/server/config.js @@ -5,27 +5,23 @@ DIR_LIB = DIR_SERVER + '../', DIR = DIR_SERVER + '../../', - HOME_WIN = process.env.HOMEPATH, - HOME_UNIX = process.env.HOME, - - HOME = (HOME_UNIX || HOME_WIN) + '/', - fs = require('fs'), + os = require('os'), password = require(DIR_SERVER + 'password'), Util = require(DIR_LIB + 'util'), CloudFunc = require(DIR_LIB + 'cloudfunc'), check = require('checkup'), - tryCatch = require('try-catch'), pipe = require('pipe-io'), ponse = require('ponse'), jonny = require('jonny'), + tryRequire = require('tryrequire'), apiURL = CloudFunc.apiURL, ConfigPath = DIR + 'json/config.json', - ConfigHome = HOME + '.cloudcmd.json', + ConfigHome = homedir() + '.cloudcmd.json', config = tryRequire(ConfigHome) || @@ -35,16 +31,16 @@ module.exports.save = save; module.exports.socket = socket; - function tryRequire(path) { - var ret, - error = tryCatch(function() { - ret = require(path); - }); + function homedir() { + var fn = os.homedir || function() { + var HOME_WIN = process.env.HOMEPATH, + HOME_UNIX = process.env.HOME, + HOME = (HOME_UNIX || HOME_WIN); + + return HOME; + }; - if (error && error.code !== 'MODULE_NOT_FOUND') - console.error(error.message); - - return ret; + return fn() + '/'; } function manage(key, value) {