From 4077a359f4c72627595f5a31205a1aba656a52f5 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 5 Aug 2020 22:43:32 +0200 Subject: [PATCH] Fixes #4294 --- lib/core/common.py | 2 +- lib/core/settings.py | 2 +- lib/parse/cmdline.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index aa15db4b0..684a9e29f 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1348,7 +1348,7 @@ def banner(): if not any(_ in sys.argv for _ in ("--version", "--api")) and not conf.get("disableBanner"): result = BANNER - if not IS_TTY or "--disable-coloring" in sys.argv: + if not IS_TTY or any(_ in sys.argv for _ in ("--disable-coloring", "--disable-colouring")): result = clearColors(result) elif IS_WIN: coloramainit() diff --git a/lib/core/settings.py b/lib/core/settings.py index 4cf729672..878858140 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.4.8.2" +VERSION = "1.4.8.3" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py index 2c412d80d..a8e7e1f7b 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -960,6 +960,8 @@ def cmdLineParser(argv=None): extraHeaders.append(argv[i + 1]) elif argv[i] == "--deps": argv[i] = "--dependencies" + elif argv[i] == "--disable-colouring": + argv[i] = "--disable-coloring" elif argv[i] == "-r": for j in xrange(i + 2, len(argv)): value = argv[j]