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

Fix tests, npm Windows fixes

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-01-21 19:21:02 -07:00
parent 186209a0a3
commit 001aa3d1a8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nodebb
View File

@@ -225,12 +225,12 @@ var getRunningPid = function (callback) {
if (['y', 'Y', 'yes', 'YES'].indexOf(result.upgrade) !== -1) { if (['y', 'Y', 'yes', 'YES'].indexOf(result.upgrade) !== -1) {
process.stdout.write('\nUpgrading packages...'); process.stdout.write('\nUpgrading packages...');
var args = ['npm', 'i']; var args = ['i'];
found.forEach(function (suggestObj) { found.forEach(function (suggestObj) {
args.push(suggestObj.name + '@' + suggestObj.suggested); args.push(suggestObj.name + '@' + suggestObj.suggested);
}); });
require('child_process').execFile('/usr/bin/env', args, { stdio: 'ignore' }, function (err) { require('child_process').execFile((process.platform === 'win32') ? 'npm.cmd' : 'npm', args, { stdio: 'ignore' }, function (err) {
if (!err) { if (!err) {
process.stdout.write(' OK\n'.green); process.stdout.write(' OK\n'.green);
} }

2
src/plugins/install.js
View File

@@ -102,7 +102,7 @@ module.exports = function (Plugins) {
} }
function runNpmCommand(command, pkgName, version, callback) { function runNpmCommand(command, pkgName, version, callback) {
require('child_process').execFile('npm', [command, pkgName + (command === 'install' ? '@' + version : '')], function (err, stdout) { require('child_process').execFile((process.platform === 'win32') ? 'npm.cmd' : 'npm', [command, pkgName + (command === 'install' ? '@' + version : '')], function (err, stdout) {
if (err) { if (err) {
return callback(err); return callback(err);
} }

2
test/mocks/databasemock.js
View File

@@ -140,7 +140,7 @@
nconf.set('theme_config', path.join(nconf.get('themes_path'), 'nodebb-theme-persona', 'theme.json')); nconf.set('theme_config', path.join(nconf.get('themes_path'), 'nodebb-theme-persona', 'theme.json'));
nconf.set('bcrypt_rounds', 1); nconf.set('bcrypt_rounds', 1);
require('../../build').buildTargets(['js', 'clientCSS', 'acpCSS', 'tpl'], next); require('../../build').buildAll(next);
}, },
function (next) { function (next) {
var webserver = require('../../src/webserver'); var webserver = require('../../src/webserver');