From 0f4244756e8f902f53acf8503651f2171c55d837 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Sat, 4 Jul 2015 04:00:27 -0400 Subject: [PATCH] feature(config) homedir -> os-homedir --- lib/server/config.js | 19 ++++--------------- package.json | 1 + 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/lib/server/config.js b/lib/server/config.js index f4914ba9..b52ed6b5 100644 --- a/lib/server/config.js +++ b/lib/server/config.js @@ -6,7 +6,7 @@ DIR = DIR_SERVER + '../../', fs = require('fs'), - os = require('os'), + path = require('path'), password = require(DIR_SERVER + 'password'), Util = require(DIR_LIB + 'util'), @@ -17,11 +17,12 @@ ponse = require('ponse'), jonny = require('jonny'), readjson = require('readjson'), + homedir = require('os-homedir'), apiURL = CloudFunc.apiURL, - ConfigPath = DIR + 'json/config.json', - ConfigHome = homedir() + '.cloudcmd.json', + ConfigPath = path.join(DIR, 'json/config.json'), + ConfigHome = path.join(homedir(), '.cloudcmd.json'), config = readjson.sync.try(ConfigHome) || @@ -38,18 +39,6 @@ return middle; }; - 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; - }; - - return fn() + '/'; - } - function manage(key, value) { var result; diff --git a/package.json b/package.json index 5fd59d67..79901c6c 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "minify": "~1.4.0", "minimist": "~1.1.0", "mollify": "~1.0.0", + "os-homedir": "~1.0.0", "package-json": "~1.2.0", "pipe-io": "~1.1.1", "ponse": "~1.4.0",