Providing options.privateKey not means no password is required.

Previously, a password prompt showed up if you did not provide a password on options.password, whether or not you provided a privateKey. There should not be a password prompt if a password OR a privateKey is provided.
spmjs · Dec 19, 2014 · 91a05d5 · 91a05d5
1 parent 640ec84
commit 91a05d5
Show file tree

Hide file tree

Showing 8 changed files with 234 additions and 1 deletion.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/tasks/scp.js b/tasks/scp.js
@@ -87,7 +87,7 @@ module.exports = function(grunt) {
       });
     }
 
-    if (options.password) {
+    if (options.password || options.privateKey) {
       execUploads();
     } else {
       inquirer.prompt([{