Skip to content

Commit d45e22e

Browse files
committed
Merge pull request #13 from udondan/master
Add ssh option to not use shared connections
2 parents 799d13f + ea2f6fc commit d45e22e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
"Ben Evans <[email protected]>",
77
"Gabriel Preston <[email protected]>",
88
"Joseph Silvestre <[email protected]>",
9-
9+
10+
"Daniel Phatthanan <[email protected]>"
1011
],
1112
"name": "scp",
1213
"description": "remote file copy wrapper",
13-
"version": "0.0.3",
14+
"version": "0.0.4",
1415
"repository": {
1516
"type": "git",
1617
"url": "git://github.com/ecto/node-scp.git"

scp.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ scp.send = function (options, cb) {
1515
'-r',
1616
'-P',
1717
(options.port == undefined ? '22' : options.port),
18+
'-o "ControlMaster no"', //callback is not fired if ssh sessions are shared
1819
options.file,
1920
(options.user == undefined ? '' : options.user+'@') + options.host + ':' + options.path,
2021
];
@@ -36,6 +37,7 @@ scp.get = function (options, cb) {
3637
'-r',
3738
'-P',
3839
(options.port == undefined ? '22' : options.port),
40+
'-o "ControlMaster no"', //callback is not fired if ssh sessions are shared
3941
(options.user == undefined ? '' : options.user+'@') + options.host + ':' + options.file,
4042
options.path
4143
];

0 commit comments

Comments
 (0)