Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 11:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

passing in arguments to npm instead of command string, closes #5286

Browse Source
This commit is contained in:
Julian Lam
2016-12-14 09:28:26 -05:00
parent 40d73e2a54
commit e028ac1363
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/install.js
View File

@@ -89,8 +89,7 @@ module.exports = function (Plugins) {
next(); next();
}, },
function (next) { function (next) {
var command = installed ? ('npm uninstall ' + id) : ('npm install ' + id + '@' + (version || 'latest')); runNpmCommand(type, id, version || 'latest', next);
runNpmCommand(command, next);
}, },
function (next) { function (next) {
Plugins.get(id, next); Plugins.get(id, next);
@@ -102,12 +101,13 @@ module.exports = function (Plugins) {
], callback); ], callback);
} }
function runNpmCommand(command, callback) { function runNpmCommand(command, pkgName, version, callback) {
require('child_process').exec(command, function (err, stdout) { require('child_process').execFile('npm', [command, pkgName + (command === 'install' ? '@' + version : '')], function (err, stdout) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
winston.verbose('[plugins] ' + stdout);
winston.verbose('[plugins/' + command + '] ' + stdout);
callback(); callback();
}); });
} }
@@ -119,9 +119,7 @@ module.exports = function (Plugins) {
function upgrade(id, version, callback) { function upgrade(id, version, callback) {
async.waterfall([ async.waterfall([
function (next) { async.apply(runNpmCommand, 'install', id, version || 'latest'),
runNpmCommand('npm install ' + id + '@' + (version || 'latest'), next);
},
function (next) { function (next) {
Plugins.isActive(id, next); Plugins.isActive(id, next);
}, },