Minor change on banner showing up

This commit is contained in:
Miroslav Stampar 2016-04-19 13:45:49 +02:00
parent 0c5965c7b8
commit e07c92bce5
2 changed files with 7 additions and 6 deletions

View File

@ -1068,10 +1068,12 @@ def banner():
This function prints sqlmap banner with its version This function prints sqlmap banner with its version
""" """
_ = BANNER
if not getattr(LOGGER_HANDLER, "is_tty", False): if not any(_ in sys.argv for _ in ("--version", "--pickled-options")):
_ = re.sub("\033.+?m", "", _) _ = BANNER
dataToStdout(_, forceOutput=True) if not getattr(LOGGER_HANDLER, "is_tty", False):
_ = re.sub("\033.+?m", "", _)
dataToStdout(_, forceOutput=True)
def parsePasswordHash(password): def parsePasswordHash(password):
""" """

View File

@ -85,6 +85,7 @@ def main():
raise SystemExit raise SystemExit
setPaths() setPaths()
banner()
# Store original command line options for possible later restoration # Store original command line options for possible later restoration
cmdLineOptions.update(cmdLineParser().__dict__) cmdLineOptions.update(cmdLineParser().__dict__)
@ -97,8 +98,6 @@ def main():
sys.stderr = StdDbOut(conf.taskid, messagetype="stderr") sys.stderr = StdDbOut(conf.taskid, messagetype="stderr")
setRestAPILog() setRestAPILog()
banner()
conf.showTime = True conf.showTime = True
dataToStdout("[!] legal disclaimer: %s\n\n" % LEGAL_DISCLAIMER, forceOutput=True) dataToStdout("[!] legal disclaimer: %s\n\n" % LEGAL_DISCLAIMER, forceOutput=True)
dataToStdout("[*] starting at %s\n\n" % time.strftime("%X"), forceOutput=True) dataToStdout("[*] starting at %s\n\n" % time.strftime("%X"), forceOutput=True)