scp now takes password with -p option from command line.

ywangd · ywangd · commit f7769979db8b · 2016-01-19T23:51:02.000+11:00
diff --git a/bin/scp.py b/bin/scp.py
@@ -521,7 +521,8 @@ def scp_callback(filename, size, sent):
     files = []
     
     ap = argparse.ArgumentParser()
-    ap.add_argument('files',nargs='*', help='file or module name')
+    ap.add_argument('-p', '--password', help='login password')
+    ap.add_argument('files', nargs='*', help='file or module name')
     args = ap.parse_args()
     
     #scp_mode 0 put 1 get
@@ -541,11 +542,15 @@ def scp_callback(filename, size, sent):
     ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
     key_filename = find_ssh_keys()
-    if len(key_filename) == 0:  # no key file found
-        password = raw_input('Enter passsword:')
-        ssh.connect(host, username=user, password=password)
+    if args.password is not None:
+        ssh.connect(host, username=user, password=args.password)
+
     else:
-        ssh.connect(host,username=user,key_filename=key_filename)
+        if len(key_filename) == 0:  # no key file found
+            password = raw_input('Enter passsword:')
+            ssh.connect(host, username=user, password=password)
+        else:
+            ssh.connect(host,username=user,key_filename=key_filename)
 
     # SCPCLient takes a paramiko transport as its only argument
     scp = SCPClient(ssh.get_transport(),progress=scp_callback)
@@ -559,5 +564,7 @@ def scp_callback(filename, size, sent):
         print 'Copying to server...'
         scp.put(files, recursive=True, remote_path=host_path)
 
+    ssh.close()
+
 
 
