re-added setting encoding for shell runner

moon2l · Jun 4, 2012 · cadbdac · cadbdac
1 parent b494c51
commit cadbdac
Showing 1 changed file with 11 additions and 1 deletion.
diff --git 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
                 });
             };