From 5dc6fed93e50497d871b9b7d1a5aae844080da3e Mon Sep 17 00:00:00 2001
From: Marcel Kloubert <marcel.kloubert@gmx.net>
Date: Wed, 3 Jan 2018 06:30:46 +0100
Subject: [PATCH] minor fixes

---
 src/clients/sftp.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/clients/sftp.ts b/src/clients/sftp.ts
index 02fa038..36972b8 100644
--- a/src/clients/sftp.ts
+++ b/src/clients/sftp.ts
@@ -385,9 +385,9 @@ export async function openConnection(opts: SFTPConnectionOptions): Promise<SFTPC
         pwd = undefined;
     }
 
-    let privateKeyFile: string = deploy_helpers.toStringSafe(opts.privateKey);
+    let privateKeyFile: string | false = deploy_helpers.toStringSafe(opts.privateKey);
     if (deploy_helpers.isEmptyString(privateKeyFile)) {
-        privateKeyFile = undefined;
+        privateKeyFile = false;
     }
 
     let privateKeyPassphrase = deploy_helpers.toStringSafe(opts.privateKeyPassphrase);
@@ -400,6 +400,11 @@ export async function openConnection(opts: SFTPConnectionOptions): Promise<SFTPC
         readyTimeout = 20000;
     }
 
+    let privateKey: Buffer;
+    if (false !== privateKeyFile) {
+        privateKey = await deploy_helpers.readFile(privateKeyFile);
+    }
+
     const DEBUG = deploy_helpers.toBooleanSafe(opts.debug);
 
     await CLIENT.client.connect({
@@ -418,7 +423,7 @@ export async function openConnection(opts: SFTPConnectionOptions): Promise<SFTPC
         passphrase: privateKeyPassphrase,
         password: pwd,
         port: port,
-        privateKey: FS.readFileSync(privateKeyFile, {'encoding':'utf8'}),
+        privateKey: privateKey,
         readyTimeout: readyTimeout,
         tryKeyboard: deploy_helpers.toBooleanSafe(opts.tryKeyboard),
         username: user,