Added ssh option to not use shared connections

Shared ssh session prevent exec() from firing the callback.
ecto · Apr 4, 2014 · ea2f6fc · ea2f6fc
1 parent 799d13f
commit ea2f6fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -6,11 +6,12 @@
     "Ben Evans <ben@bensbit.co.uk>",
     "Gabriel Preston <gpreston@gmail.com>",
     "Joseph Silvestre <joseph.silvestre38@gmail.com>",
-    "appr <appr@appr.me>"
+    "appr <appr@appr.me>",
+    "Daniel Phatthanan <daniel@phatthanan.com>"
   ],
   "name": "scp",
   "description": "remote file copy wrapper",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "repository": {
     "type": "git",
     "url": "git://github.com/ecto/node-scp.git"

diff --git a/scp.js b/scp.js
@@ -15,6 +15,7 @@ scp.send = function (options, cb) {
     '-r',
     '-P',
     (options.port == undefined ? '22' : options.port),
+    '-o "ControlMaster no"', //callback is not fired if ssh sessions are shared
     options.file,
     (options.user == undefined ? '' : options.user+'@') + options.host + ':' + options.path,
   ];
@@ -36,6 +37,7 @@ scp.get = function (options, cb) {
     '-r',
     '-P',
     (options.port == undefined ? '22' : options.port),
+    '-o "ControlMaster no"', //callback is not fired if ssh sessions are shared
     (options.user == undefined ? '' : options.user+'@') + options.host + ':' + options.file,
     options.path
   ];