mirror of
				https://github.com/ether/etherpad-lite.git
				synced 2025-11-04 10:11:33 +01:00 
			
		
		
		
	Fix bin/extractPadData on windows
This commit is contained in:
		
							parent
							
								
									18b6cf1534
								
							
						
					
					
						commit
						af25606ea8
					
				@ -13,8 +13,8 @@ var padId = process.argv[2];
 | 
			
		||||
var db, dirty, padManager, pad, settings;
 | 
			
		||||
var neededDBValues = ["pad:"+padId];
 | 
			
		||||
 | 
			
		||||
var npm = require("../src/node_modules/npm");
 | 
			
		||||
var async = require("../src/node_modules/async");
 | 
			
		||||
var npm = require("../node_modules/ep_etherpad-lite/node_modules/npm");
 | 
			
		||||
var async = require("../node_modules/ep_etherpad-lite/node_modules/async");
 | 
			
		||||
 | 
			
		||||
async.series([
 | 
			
		||||
  // load npm
 | 
			
		||||
@ -33,8 +33,8 @@ async.series([
 | 
			
		||||
  },
 | 
			
		||||
  // load modules
 | 
			
		||||
  function(callback) {
 | 
			
		||||
    settings = require('../src/node/utils/Settings');
 | 
			
		||||
    db = require('../src/node/db/DB');
 | 
			
		||||
    settings = require('../node_modules/ep_etherpad-lite/node/utils/Settings');
 | 
			
		||||
    db = require('../node_modules/ep_etherpad-lite/node/db/DB');
 | 
			
		||||
    dirty = require("../node_modules/ep_etherpad-lite/node_modules/ueberDB/node_modules/dirty")(padId + ".db");
 | 
			
		||||
    callback();
 | 
			
		||||
  },
 | 
			
		||||
@ -46,7 +46,7 @@ async.series([
 | 
			
		||||
  //get the pad 
 | 
			
		||||
  function (callback)
 | 
			
		||||
  {
 | 
			
		||||
    padManager = require('../src/node/db/PadManager');
 | 
			
		||||
    padManager = require('../node_modules/ep_etherpad-lite/node/db/PadManager');
 | 
			
		||||
    
 | 
			
		||||
    padManager.getPad(padId, function(err, _pad)  
 | 
			
		||||
    {
 | 
			
		||||
@ -84,7 +84,7 @@ async.series([
 | 
			
		||||
      {
 | 
			
		||||
        if(err) { callback(err); return}
 | 
			
		||||
 | 
			
		||||
        if(typeof dbvalue != 'object'){
 | 
			
		||||
        if(dbvalue && typeof dbvalue != 'object'){
 | 
			
		||||
          dbvalue=JSON.parse(dbvalue); // if its not json then parse it as json
 | 
			
		||||
        }
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user