Merge pull request #1361 from mluto/fix-checkPad

Load npm before everything else in checkPad.js
This commit is contained in:
John McLear 2013-01-15 06:13:23 -08:00
commit 53b2de51eb

View file

@ -10,15 +10,25 @@ if(process.argv.length != 3)
//get the padID //get the padID
var padId = process.argv[2]; var padId = process.argv[2];
//initalize the database //initalize the variables
var settings = require("../src/node/utils/Settings"); var db, settings, padManager;
var npm = require("../src/node_modules/npm");
var async = require("../src/node_modules/async"); var async = require("../src/node_modules/async");
var db = require('../src/node/db/DB');
var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var Changeset = require("ep_etherpad-lite/static/js/Changeset");
var padManager;
async.series([ async.series([
//load npm
function(callback) {
npm.load({}, function(er) {
callback(er);
})
},
//load modules
function(callback) {
settings = require('../src/node/utils/Settings');
db = require('../src/node/db/DB');
},
//intallize the database //intallize the database
function (callback) function (callback)
{ {