See rapid7#7089, add some stray fixups

Author: Brent Cook

lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb

@@ -203,7 +203,7 @@ def Dir.download(dst, src, opts, force = true, glob = nil, &stat)
     tries_cnt = 0
     if opts
       timestamp = opts["timestamp"]
-      recursive = true if opts["recursive"]     
+      recursive = true if opts["recursive"]
       continue = true if opts["continue"]
       tries = true if opts["tries"]
       tries_no = opts["tries_no"]

lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/clipboard.rb

@@ -377,7 +377,6 @@ def download_file( dest_folder, source )
 
     if stat.directory?
       client.fs.dir.download( dest, source, {"recursive" => true}, true ) { |step, src, dst|
-#      client.fs.dir.download( dest, source, true, true ) { |step, src, dst|
         print_line( "#{step.ljust(11)} : #{src} -> #{dst}" )
         client.framework.events.on_session_download( client, src, dest ) if msf_loaded?
       }

lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb

@@ -25,7 +25,7 @@ class Console::CommandDispatcher::Stdapi::Fs
   @@download_opts = Rex::Parser::Arguments.new(
     "-h" => [ false, "Help banner." ],
     "-c" => [ false, "Resume getting a partially-downloaded file." ],
-    "-l" => [ true, "Set the limit of retries (0 unlimits)." ],
+    "-l" => [ true,  "Set the limit of retries (0 unlimits)." ],
     "-r" => [ false, "Download recursively." ],
     "-t" => [ false, "Timestamp downloaded files." ])
   #
@@ -39,7 +39,7 @@ class Console::CommandDispatcher::Stdapi::Fs
   #
   @@ls_opts = Rex::Parser::Arguments.new(
     "-h" => [ false, "Help banner." ],
-    "-S" => [ true, "Search string." ],
+    "-S" => [ true,  "Search string." ],
     "-t" => [ false, "Sort by time" ],
     "-s" => [ false, "Sort by size" ],
     "-r" => [ false, "Reverse sort order" ],
@@ -66,7 +66,7 @@ def commands
       'mkdir'      => 'Make directory',
       'pwd'        => 'Print working directory',
       'rm'         => 'Delete the specified file',
-      'mv'	       => 'Move source to destination',
+      'mv'         => 'Move source to destination',
       'rmdir'      => 'Remove directory',
       'search'     => 'Search for files',
       'upload'     => 'Upload a file or directory',
@@ -341,7 +341,7 @@ def cmd_download(*args)
     continue  = false
     tries     = false
     tries_no  = 0
-    opts = {}
+    opts      = {}
 
     @@download_opts.parse(args) { |opt, idx, val|
       case opt
@@ -408,7 +408,6 @@ def cmd_download(*args)
             dest_path = src_path.tr(src_separator, ::File::SEPARATOR)
 
             client.fs.file.download(dest_path, src_path, opts) do |step, src, dst|
-              puts step
               print_status("#{step.ljust(11)}: #{src} -> #{dst}")
               client.framework.events.on_session_download(client, src, dest) if msf_loaded?
             end