From 7db6448e2acb68bec8f70afd5f1389e60ac90858 Mon Sep 17 00:00:00 2001 From: mluto Date: Tue, 15 Jan 2013 07:31:51 +0100 Subject: [PATCH] Load npm before everything else in checkPad.js --- bin/checkPad.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/bin/checkPad.js b/bin/checkPad.js index a92f836ca..bad5abced 100644 --- a/bin/checkPad.js +++ b/bin/checkPad.js @@ -10,15 +10,25 @@ if(process.argv.length != 3) //get the padID var padId = process.argv[2]; -//initalize the database -var settings = require("../src/node/utils/Settings"); +//initalize the variables +var db, settings, padManager; +var npm = require("../src/node_modules/npm"); var async = require("../src/node_modules/async"); -var db = require('../src/node/db/DB'); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); -var padManager; 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 function (callback) {