linting nodebb executable

v1.18.x
Julian Lam 8 years ago
parent 74728a1328
commit 35248c543b

@ -29,7 +29,7 @@ if (args.dev) {
function getRunningPid(callback) { function getRunningPid(callback) {
fs.readFile(__dirname + '/pidfile', { fs.readFile(__dirname + '/pidfile', {
encoding: 'utf-8' encoding: 'utf-8',
}, function (err, pid) { }, function (err, pid) {
if (err) { if (err) {
return callback(err); return callback(err);
@ -38,7 +38,7 @@ function getRunningPid(callback) {
try { try {
process.kill(parseInt(pid, 10), 0); process.kill(parseInt(pid, 10), 0);
callback(null, parseInt(pid, 10)); callback(null, parseInt(pid, 10));
} catch(e) { } catch (e) {
callback(e); callback(e);
} }
}); });
@ -52,7 +52,7 @@ function getCurrentVersion(callback) {
try { try {
pkg = JSON.parse(pkg); pkg = JSON.parse(pkg);
return callback(null, pkg.version); return callback(null, pkg.version);
} catch(err) { } catch (err) {
return callback(err); return callback(err);
} }
}); });
@ -60,20 +60,21 @@ function getCurrentVersion(callback) {
function fork(args) { function fork(args) {
return cproc.fork('app.js', args, { return cproc.fork('app.js', args, {
cwd: __dirname, cwd: __dirname,
silent: false silent: false,
}); });
} }
function getInstalledPlugins(callback) { function getInstalledPlugins(callback) {
async.parallel({ async.parallel({
files: async.apply(fs.readdir, path.join(__dirname, 'node_modules')), files: async.apply(fs.readdir, path.join(__dirname, 'node_modules')),
deps: async.apply(fs.readFile, path.join(__dirname, 'package.json'), { encoding: 'utf-8' }) deps: async.apply(fs.readFile, path.join(__dirname, 'package.json'), { encoding: 'utf-8' }),
}, function (err, payload) { }, function (err, payload) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
var isNbbModule = /^nodebb-(?:plugin|theme|widget|rewards)-[\w\-]+$/, var isNbbModule = /^nodebb-(?:plugin|theme|widget|rewards)-[\w\-]+$/;
moduleName, isGitRepo; var moduleName;
var isGitRepo;
payload.files = payload.files.filter(function (file) { payload.files = payload.files.filter(function (file) {
return isNbbModule.test(file); return isNbbModule.test(file);
@ -98,7 +99,7 @@ function getInstalledPlugins(callback) {
try { try {
fs.accessSync(path.join(__dirname, 'node_modules/' + moduleName, '.git')); fs.accessSync(path.join(__dirname, 'node_modules/' + moduleName, '.git'));
isGitRepo = true; isGitRepo = true;
} catch(e) { } catch (e) {
isGitRepo = false; isGitRepo = false;
} }
@ -144,7 +145,7 @@ function checkPlugins(standalone, callback) {
async.waterfall([ async.waterfall([
async.apply(async.parallel, { async.apply(async.parallel, {
plugins: async.apply(getInstalledPlugins), plugins: async.apply(getInstalledPlugins),
version: async.apply(getCurrentVersion) version: async.apply(getCurrentVersion),
}), }),
function (payload, next) { function (payload, next) {
var toCheck = Object.keys(payload.plugins); var toCheck = Object.keys(payload.plugins);
@ -157,7 +158,7 @@ function checkPlugins(standalone, callback) {
request({ request({
method: 'GET', method: 'GET',
url: 'https://packages.nodebb.org/api/v1/suggest?version=' + payload.version + '&package[]=' + toCheck.join('&package[]='), url: 'https://packages.nodebb.org/api/v1/suggest?version=' + payload.version + '&package[]=' + toCheck.join('&package[]='),
json: true json: true,
}, function (err, res, body) { }, function (err, res, body) {
if (err) { if (err) {
process.stdout.write('error'.red + '\n'.reset); process.stdout.write('error'.red + '\n'.reset);
@ -169,7 +170,8 @@ function checkPlugins(standalone, callback) {
body = [body]; body = [body];
} }
var current, suggested, var current,
suggested,
upgradable = body.map(function (suggestObj) { upgradable = body.map(function (suggestObj) {
current = payload.plugins[suggestObj.package]; current = payload.plugins[suggestObj.package];
suggested = suggestObj.version; suggested = suggestObj.version;
@ -178,16 +180,15 @@ function checkPlugins(standalone, callback) {
return { return {
name: suggestObj.package, name: suggestObj.package,
current: current, current: current,
suggested: suggested suggested: suggested,
}; };
} else {
return null;
} }
return null;
}).filter(Boolean); }).filter(Boolean);
next(null, upgradable); next(null, upgradable);
}); });
} },
], callback); ], callback);
} }
function upgradePlugins(callback) { function upgradePlugins(callback) {
@ -223,7 +224,7 @@ function upgradePlugins(callback) {
prompt.get({ prompt.get({
name: 'upgrade', name: 'upgrade',
description: 'Proceed with upgrade (y|n)?'.reset, description: 'Proceed with upgrade (y|n)?'.reset,
type: 'string' type: 'string',
}, function (err, result) { }, function (err, result) {
if (err) { if (err) {
return callback(err); return callback(err);
@ -280,7 +281,7 @@ var commands = {
// Spawn a new NodeBB process // Spawn a new NodeBB process
cproc.fork(__dirname + '/loader.js', { cproc.fork(__dirname + '/loader.js', {
env: process.env env: process.env,
}); });
}, },
}, },
@ -320,7 +321,7 @@ var commands = {
process.stdout.write('\n\n'.reset); process.stdout.write('\n\n'.reset);
cproc.spawn('tail', ['-F', './logs/output.log'], { cproc.spawn('tail', ['-F', './logs/output.log'], {
cwd: __dirname, cwd: __dirname,
stdio: 'inherit' stdio: 'inherit',
}); });
}, },
}, },
@ -334,11 +335,11 @@ var commands = {
// Spawn a new NodeBB process // Spawn a new NodeBB process
cproc.fork(__dirname + '/loader.js', { cproc.fork(__dirname + '/loader.js', {
env: process.env env: process.env,
}); });
cproc.spawn('tail', ['-F', './logs/output.log'], { cproc.spawn('tail', ['-F', './logs/output.log'], {
cwd: __dirname, cwd: __dirname,
stdio: 'inherit' stdio: 'inherit',
}); });
}, },
}, },
@ -348,7 +349,7 @@ var commands = {
handler: function () { handler: function () {
process.env.NODE_ENV = 'development'; process.env.NODE_ENV = 'development';
cproc.fork(__dirname + '/loader.js', ['--no-daemon', '--no-silent'], { cproc.fork(__dirname + '/loader.js', ['--no-daemon', '--no-silent'], {
env: process.env env: process.env,
}); });
}, },
}, },
@ -434,7 +435,7 @@ var commands = {
var upgradeProc = fork(arr); var upgradeProc = fork(arr);
upgradeProc.on('close', next); upgradeProc.on('close', next);
} },
], function (err) { ], function (err) {
if (err) { if (err) {
process.stdout.write('\nError'.red + ': ' + err.message + '\n'); process.stdout.write('\nError'.red + ': ' + err.message + '\n');
@ -442,7 +443,7 @@ var commands = {
var message = 'NodeBB Upgrade Complete!'; var message = 'NodeBB Upgrade Complete!';
// some consoles will return undefined/zero columns, so just use 2 spaces in upgrade script if we can't get our column count // some consoles will return undefined/zero columns, so just use 2 spaces in upgrade script if we can't get our column count
var columns = process.stdout.columns; var columns = process.stdout.columns;
var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : " "; var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : ' ';
process.stdout.write('OK\n'.green); process.stdout.write('OK\n'.green);
process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset); process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset);

Loading…
Cancel
Save