From 8af87c7ea6b598e9ec9aa50ba4914572ca07c68b Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 19 Jul 2021 13:58:54 +0200 Subject: [PATCH] More text update --- lib/core/settings.py | 2 +- lib/core/update.py | 2 +- lib/utils/api.py | 2 +- lib/utils/sqlalchemy.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 41d1477b9..fbc0a3fe9 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from thirdparty import six from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.5.7.5" +VERSION = "1.5.7.6" 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/core/update.py b/lib/core/update.py index 8bdd1df09..d9b597215 100644 --- a/lib/core/update.py +++ b/lib/core/update.py @@ -166,6 +166,6 @@ def update(): infoMsg += "https://github.com/sqlmapproject/sqlmap/downloads" else: infoMsg = "for Linux platform it's recommended " - infoMsg += "to install a standard 'git' package (e.g.: 'sudo apt install git')" + infoMsg += "to install a standard 'git' package (e.g.: 'apt install git')" logger.info(infoMsg) diff --git a/lib/utils/api.py b/lib/utils/api.py index a478c8bba..0b08df882 100644 --- a/lib/utils/api.py +++ b/lib/utils/api.py @@ -724,7 +724,7 @@ def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter=REST errMsg += "List of supported adapters: %s" % ', '.join(sorted(list(server_names.keys()))) else: errMsg = "Server support for adapter '%s' is not installed on this system " % adapter - errMsg += "(Note: you can try to install it with 'sudo apt install python-%s' or 'sudo pip%s install %s')" % (adapter, '3' if six.PY3 else "", adapter) + errMsg += "(Note: you can try to install it with 'apt install python-%s' or 'pip%s install %s')" % (adapter, '3' if six.PY3 else "", adapter) logger.critical(errMsg) def _client(url, options=None): diff --git a/lib/utils/sqlalchemy.py b/lib/utils/sqlalchemy.py index eafc7e9aa..3a1266d09 100644 --- a/lib/utils/sqlalchemy.py +++ b/lib/utils/sqlalchemy.py @@ -35,6 +35,7 @@ from lib.core.exception import SqlmapConnectionException from lib.core.exception import SqlmapFilePathException from lib.core.exception import SqlmapMissingDependence from plugins.generic.connector import Connector as GenericConnector +from thirdparty import six def getSafeExString(ex, encoding=None): # Cross-referenced function raise NotImplementedError @@ -88,7 +89,7 @@ class SQLAlchemy(GenericConnector): self.printConnected() else: - raise SqlmapMissingDependence("SQLAlchemy not available (e.g. 'pip install SQLAlchemy')") + raise SqlmapMissingDependence("SQLAlchemy not available (e.g. 'pip%s install SQLAlchemy')" % ('3' if six.PY3 else "")) def fetchall(self): try: