From cadbdaccbd1020b949d37b66c2d97da2895a8ede Mon Sep 17 00:00:00 2001 From: linh81 Date: Mon, 4 Jun 2012 15:19:11 +0200 Subject: [PATCH] re-added setting encoding for shell runner --- plugins-server/cloud9.run.shell/shell.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins-server/cloud9.run.shell/shell.js b/plugins-server/cloud9.run.shell/shell.js index ed2e128641f..19ca56de43f 100644 --- a/plugins-server/cloud9.run.shell/shell.js +++ b/plugins-server/cloud9.run.shell/shell.js @@ -53,6 +53,11 @@ var Runner = exports.Runner = function(options, callback) { this.runOptions.env = this.env; + this.encoding = options.encoding || "utf8"; + if (this.encoding === "binary") { + this.encoding = null; + } + this.eventEmitter = options.eventEmitter; this.eventName = options.eventName; @@ -132,6 +137,11 @@ var Runner = exports.Runner = function(options, callback) { child.stdout.on("data", sender("stdout")); child.stderr.on("data", sender("stderr")); + if (self.encoding) { + child.stdout.setEncoding(self.encoding); + child.stderr.setEncoding(self.encoding); + } + function emit(msg) { self.eventEmitter.emit(self.eventName, msg); } @@ -142,7 +152,7 @@ var Runner = exports.Runner = function(options, callback) { "type": self.name + "-data", "pid": pid, "stream": stream, - "data": data.toString("utf8"), + "data": data, "extra": self.extra }); };