Fixes #153 Disable error trace when it's from the main script

This commit is contained in:
erwanlr
2013-04-13 11:35:52 +02:00
parent 92d690e357
commit 4ecbf7fe79

View File

@@ -15,14 +15,13 @@ def main
unless wpscan_options.has_options? unless wpscan_options.has_options?
usage() usage()
puts red('No argument supplied') raise('No argument supplied')
exit(0)
end end
if wpscan_options.help if wpscan_options.help
help() help()
usage() usage()
exit exit(1)
end end
# Check for updates # Check for updates
@@ -321,9 +320,13 @@ def main
puts green("[+] Elapsed time: #{Time.at(elapsed).utc.strftime('%H:%M:%S')}") puts green("[+] Elapsed time: #{Time.at(elapsed).utc.strftime('%H:%M:%S')}")
exit() # must exit! exit() # must exit!
rescue => e rescue => e
puts red("[ERROR] #{e.message}") if e.backtrace[0] =~ /main/
puts red('Trace :') puts red(e.message)
puts red(e.backtrace.join("\n")) else
puts red("[ERROR] #{e.message}")
puts red('Trace :')
puts red(e.backtrace.join("\n"))
end
end end
end end