mirror of
https://github.com/CryptKeeperZK/ejs.git
synced 2026-01-10 07:58:26 -05:00
Merge commit 'kurokikaze/model-validations' into model-validations-node-version
This commit is contained in:
@@ -29,7 +29,7 @@ Apache License, Version 2
|
||||
|
||||
** Prerequisites**
|
||||
|
||||
Geddy requires version 0.1.33 of Node.js.
|
||||
Geddy requires version 0.1.91 of Node.js.
|
||||
|
||||
To get Geddy from GitHub and install it:
|
||||
|
||||
|
||||
@@ -18,7 +18,8 @@
|
||||
|
||||
var fs = require('fs');
|
||||
var sys = require('sys');
|
||||
//var child_process = require('child_process');
|
||||
var child_process = require('child_process');
|
||||
//var chexec =
|
||||
|
||||
var fleegix = require('geddy-core/lib/fleegix');
|
||||
var session = require('geddy-core/lib/session');
|
||||
@@ -97,7 +98,7 @@ var Init = function (config, callback) {
|
||||
{
|
||||
func: session.createStore,
|
||||
args: [config.sessions.store],
|
||||
callback: null,
|
||||
callback: null
|
||||
},
|
||||
{
|
||||
func: fs.readdir,
|
||||
@@ -110,7 +111,7 @@ var Init = function (config, callback) {
|
||||
callback: this.registerControllers
|
||||
},
|
||||
{
|
||||
func: sys.exec,
|
||||
func: child_process.exec,
|
||||
args: ['find ' + config.dirname + '/app/views'],
|
||||
callback: this.registerTemplates
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ var requests = new function () {
|
||||
this.close = function () {
|
||||
if (this.finished()) {
|
||||
this.resp.write(this.content);
|
||||
this.resp.close();
|
||||
this.resp.end();
|
||||
}
|
||||
};
|
||||
}();
|
||||
|
||||
@@ -243,7 +243,7 @@ Response.prototype = new function () {
|
||||
};
|
||||
|
||||
this.finish = function () {
|
||||
this.resp.close();
|
||||
this.resp.end();
|
||||
};
|
||||
|
||||
}();
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
var sys = require('sys');
|
||||
//var child_process = require('child_process');
|
||||
var child_process = require('child_process');
|
||||
var fs = require('fs');
|
||||
|
||||
exports.tasks = {
|
||||
@@ -108,11 +108,12 @@ exports.tasks = {
|
||||
};
|
||||
|
||||
// Runs an array of shell commands asynchronously, calling the
|
||||
// next command off the queue inside the callback from sys.exec.
|
||||
// next command off the queue inside the callback from child_process.exec.
|
||||
// When the queue is done, call the final callback function.
|
||||
|
||||
var runCmds = function (arr, callback) {
|
||||
var run = function (cmd) {
|
||||
sys.exec(cmd, function (err, stdout, stderr) {
|
||||
child_process.exec(cmd, function (err, stdout, stderr) {
|
||||
if (err) {
|
||||
sys.puts('Error: ' + JSON.stringify(err));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user