fixed setting file modes in SFTP

mkloubert · Jun 16, 2017 · 49081cf · 49081cf
1 parent e68cf96
commit 49081cf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log (vs-deploy)
 
+## 9.26.0 (June 16th, 2017; SFTP)
+
+* bugfixes in [sftp target](https://github.com/mkloubert/vs-deploy/wiki/target_sftp) when setting [file mode](https://github.com/mkloubert/vs-deploy/wiki/target_sftp#modes-for-specific-files) after a file has been uploaded
+
 ## 9.25.0 (June 12th, 2017; russian translation)
 
 * [russian translation](https://github.com/mkloubert/vs-deploy/blob/master/src/lang/ru.ts) updated by [sag3ll0](https://github.com/sag3ll0)

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vs-deploy",
   "displayName": "Deploy",
   "description": "Commands for deploying files of your workspace to a destination.",
-  "version": "9.25.0",
+  "version": "9.26.0",
   "publisher": "mkloubert",
   "engines": {
     "vscode": "^1.6.0"

diff --git a/src/plugins/sftp.ts b/src/plugins/sftp.ts
@@ -543,10 +543,7 @@ class SFtpPlugin extends deploy_objects.DeployPluginWithContextBase<SFTPContext>
                     mode = asOctalNumber(target.modes);
                 }
 
-                if (deploy_helpers.isNullUndefinedOrEmptyString(mode)) {
-                    putOpts = undefined;
-                }
-                else {
+                if (!deploy_helpers.isNullUndefinedOrEmptyString(mode)) {
                     putOpts['mode'] = mode;
                 }
             }
@@ -726,8 +723,20 @@ class SFtpPlugin extends deploy_objects.DeployPluginWithContextBase<SFTPContext>
                                     // upload
                                     putWorkflow.next(() => {
                                         return new Promise<any>((resolve, reject) => {
-                                            ctx.connection.put(dataToUpload, targetFile, putOpts).then(() => {
-                                                resolve();
+                                            ctx.connection.put(dataToUpload, targetFile).then(() => {
+                                                if (deploy_helpers.isNullOrUndefined(putOpts['mode'])) {
+                                                    resolve();
+                                                }
+                                                else {
+                                                    ctx.connection.sftp.chmod(targetFile, putOpts['mode'], (err) => {
+                                                        if (err) {
+                                                            reject(err);
+                                                        }
+                                                        else {
+                                                            resolve();
+                                                        }
+                                                    });
+                                                }
                                             }).catch((e) => {
                                                 reject(e);
                                             });