mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-01-23 10:45:47 +00:00
feature(config) add os.homedir
This commit is contained in:
parent
86357ae748
commit
8df7a8a019
1 changed files with 12 additions and 16 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue