Merge pull request #19 from Antallagon/master

Providing options.privateKey means no password is required
spmjs · Dec 20, 2014 · be1b78e · be1b78e
2 parents 640ec84 + 509b8e5
commit be1b78e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ node_modules
 npm-debug.log
 *.iml
 tmp
+.idea
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([{
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ node_modules @@
     npm-debug.log
     *.iml
     tmp
+    .idea