From 1f8c6f87c9dce936a46ffa5630e30e265703dae6 Mon Sep 17 00:00:00 2001
From: dceejay <conway@uk.ibm.com>
Date: Wed, 11 Mar 2015 17:43:42 +0000
Subject: [PATCH] add don't add payload to exec node to close #578

---
 nodes/core/core/75-exec.html | 25 ++++++++++++++++++++-----
 nodes/core/core/75-exec.js   | 10 ++++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/nodes/core/core/75-exec.html b/nodes/core/core/75-exec.html
index 8d1279cb1..731656802 100644
--- a/nodes/core/core/75-exec.html
+++ b/nodes/core/core/75-exec.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013,2015 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -20,8 +20,13 @@
         <input type="text" id="node-input-command" placeholder="command">
     </div>
     <div class="form-row">
-        <label for="node-input-append"><i class="fa fa-list"></i> Append</label>
-        <input type="text" id="node-input-append" placeholder="extra input">
+        <label><i class="fa fa-plus"></i> Append</label>
+        <input type="checkbox" id="node-input-addpay" style="display: inline-block; width: auto; vertical-align: top;">
+        &nbsp;msg.payload
+    </div>
+    <div class="form-row">
+        <label for="node-input-append"> </label>
+        <input type="text" id="node-input-append" placeholder="extra input parameters">
     </div>
     <div class="form-row">
         <label>&nbsp;</label>
@@ -32,7 +37,7 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-tips">Tip: <i>spawn</i> expects only one command word - and appended args to be comma separated.</div>
+    <div class="form-tips" id="spawnTip">Tip: <i>spawn</i> expects only one command word - and appended args to be comma separated.</div>
 </script>
 
 <script type="text/x-red" data-help-name="exec">
@@ -40,7 +45,7 @@
     <p>Provides 3 outputs... stdout, stderr, and return code.</p>
     <p>By default uses exec() which calls the command, blocks while waiting for completion, and then returns the complete result in one go, along with any errors.</p>
     <p>Optionally can use spawn() instead, which returns output from stdout and stderr as the command runs (ie one line at a time). On completion it then returns a return code (on the 3rd output).</p>
-    <p>Spawn only expect one command word, with all extra parameters to be comma separated and passed as the append.</p>
+    <p>Spawn only expects one command word, with all extra parameters to be comma separated and passed as the append.</p>
     <p>The optional append gets added to the command after the <b>msg.payload</b> - so you can do things like pipe the result to another command.</p>
     <p>If stdout is binary a <i>buffer</i> is returned - otherwise returns a <i>string</i>.</p>
 </script>
@@ -51,6 +56,7 @@
         color:"darksalmon",
         defaults: {
             command: {value:"",required:true},
+            addpay: {value:true},
             append: {value:""},
             useSpawn: {value:""},
             name: {value:""}
@@ -64,6 +70,15 @@
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            $("#node-input-useSpawn").on("change",function() {
+                if ($("#node-input-useSpawn").is(':checked')) {
+                    $("#spawnTip").show();
+                } else {
+                    $("#spawnTip").hide();
+                }
+            });
         }
     });
 </script>
diff --git a/nodes/core/core/75-exec.js b/nodes/core/core/75-exec.js
index 1605031af..df5d92e72 100644
--- a/nodes/core/core/75-exec.js
+++ b/nodes/core/core/75-exec.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 IBM Corp.
+ * Copyright 2013,2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ module.exports = function(RED) {
     function ExecNode(n) {
         RED.nodes.createNode(this,n);
         this.cmd = n.command.trim();
+        this.addpay = n.addpay;
         this.append = n.append.trim() || "";
         this.useSpawn = n.useSpawn;
 
@@ -35,7 +36,7 @@ module.exports = function(RED) {
                 if (typeof(msg.payload !== "string")) { msg.payload = msg.payload.toString(); }
                 var arg = [];
                 if (node.append.length > 0) { arg = node.append.split(","); }
-                if (msg.payload.trim() !== "") { arg.unshift(msg.payload); }
+                if ((node.addpay === true) && (msg.payload.trim() !== "")) { arg.unshift(msg.payload); }
                 if (RED.settings.verbose) { node.log(node.cmd+" ["+arg+"]"); }
                 if (node.cmd.indexOf(" ") == -1) {
                     var ex = spawn(node.cmd,arg);
@@ -64,7 +65,9 @@ module.exports = function(RED) {
                 else { node.error("Spawn command must be just the command - no spaces or extra parameters"); }
             }
             else {
-                var cl = node.cmd+" "+msg.payload+" "+node.append;
+                var cl = node.cmd;
+                if ((node.addpay === true) && (msg.payload.trim() !== "")) { cl += " "+msg.payload; }
+                if (node.append.trim() !== "") { cl += " "+node.append; }
                 if (RED.settings.verbose) { node.log(cl); }
                 var child = exec(cl, {encoding: 'binary', maxBuffer:10000000}, function (error, stdout, stderr) {
                     msg.payload = new Buffer(stdout,"binary");
@@ -83,6 +86,5 @@ module.exports = function(RED) {
             }
         });
     }
-
     RED.nodes.registerType("exec",ExecNode);
 }