more cleanup

Author: Brent Cook

scripts/meterpreter/multi_console_command.rb

@@ -22,46 +22,17 @@
   "-rc" => [ true,"Text file with list of commands, one per line."]
 )
 
-#Setting Argument variables
 commands = nil
 script = []
-help = 0
-silence = 0
-
-################## Function Declarations ##################
-# Function for running a list of commands stored in a array, returs string
-def list_con_exec(cmdlst, silence)
-  print_status("Running Command List ...")
-  cmdout = ""
-  cmdlst.each do |cmd|
-    next if cmd.strip.length < 1
-    next if cmd[0,1] == "#"
-    begin
-      print_status "\tRunning command #{cmd}"
-      if silence == 1     
-          @client.console.disable_output = true
-      end
-      
-      @client.console.run_single(cmd)
-      
-      if silence == 1           
-        @client.console.disable_output = false
-      end  
-      
-    rescue ::Exception => e
-      print_status("Error Running Command #{cmd}: #{e.class} #{e}")
-    end
-  end
-  cmdout
-end
-
+help = false
+silence = false
 
 def usage
   print_line("Console Multi Command Execution Meterpreter Script ")
   print_line(@@exec_opts.usage)
   raise Rex::Script::Completed
 end
-################## Main ##################
+
 @@exec_opts.parse(args) { |opt, idx, val|
   case opt
 
@@ -79,16 +50,34 @@ def usage
     end
 
   when "-h"
-    help = 1
+    help = true
   when "-sl"
-    silence = 1
+    silence = true
   end
 }
 
-if args.length == 0 or help == 1 or commands.nil?
+if args.length == 0 or help or commands.nil?
   usage
-else
-  list_con_exec(commands, silence)
-  raise Rex::Script::Completed
 end
 
+print_status("Running Command List ...")
+
+commands.each do |cmd|
+  next if cmd.strip.length < 1
+  next if cmd[0,1] == "#"
+  begin
+    print_status "\tRunning command #{cmd}"
+    if silence
+        @client.console.disable_output = true
+    end
+
+    @client.console.run_single(cmd)
+
+    if silence
+      @client.console.disable_output = false
+    end
+
+  rescue ::Exception => e
+    print_status("Error Running Command #{cmd}: #{e.class} #{e}")
+  end
+end