Skip to content

Commit 0037c28

Browse files
committed
Preventing obnoxious 'install git' on MacOS
1 parent 2b27923 commit 0037c28

4 files changed

Lines changed: 6 additions & 11 deletions

File tree

extra/shutils/regressiontest.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222

2323
START_TIME = time.strftime("%H:%M:%S %d-%m-%Y", time.gmtime())
2424
SQLMAP_HOME = "/opt/sqlmap"
25-
REVISION = getRevisionNumber()
2625

2726
SMTP_SERVER = "127.0.0.1"
2827
SMTP_PORT = 25
2928
SMTP_TIMEOUT = 30
3029
FROM = "regressiontest@sqlmap.org"
3130
#TO = "dev@sqlmap.org"
3231
TO = ["bernardo.damele@gmail.com", "miroslav.stampar@gmail.com"]
33-
SUBJECT = "regression test started on %s using revision %s" % (START_TIME, REVISION)
32+
SUBJECT = "regression test started on %s using revision %s" % (START_TIME, getRevisionNumber())
3433
TARGET = "debian"
3534

3635
def prepare_email(content):

lib/core/settings.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
from lib.core.enums import DBMS
1818
from lib.core.enums import DBMS_DIRECTORY_NAME
1919
from lib.core.enums import OS
20-
from lib.core.revision import getRevisionNumber
2120

2221
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
23-
VERSION = "1.0.10.21"
24-
REVISION = getRevisionNumber()
22+
VERSION = "1.0.10.22"
2523
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2624
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2725
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/core/update.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ def update():
5353
stderr = getSafeExString(ex)
5454

5555
if success:
56-
import lib.core.settings
57-
_ = lib.core.settings.REVISION = getRevisionNumber()
58-
logger.info("%s the latest revision '%s'" % ("already at" if "Already" in stdout else "updated to", _))
56+
logger.info("%s the latest revision '%s'" % ("already at" if "Already" in stdout else "updated to", getRevisionNumber()))
5957
else:
6058
if "Not a git repository" in stderr:
6159
errMsg = "not a valid git repository. Please checkout the 'sqlmapproject/sqlmap' repository "

txt/checksum.md5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ d229479d02d21b29f209143cb0547780 extra/shellcodeexec/linux/shellcodeexec.x32_
1616
c55b400b72acc43e0e59c87dd8bb8d75 extra/shellcodeexec/windows/shellcodeexec.x32.exe_
1717
b46521e29ea3d813bab5aeb16cac6498 extra/shutils/duplicates.py
1818
4bf52b3fd5e906b9bbe104dda769f5c5 extra/shutils/pylint.py
19-
05615626222060120450518136b14ba9 extra/shutils/regressiontest.py
19+
a8dd1f5799ed863a80b94c36b5428528 extra/shutils/regressiontest.py
2020
cc9c82cfffd8ee9b25ba3af6284f057e extra/sqlharvest/__init__.py
2121
4f2f817596540d82f9fcc0c5b2228beb extra/sqlharvest/sqlharvest.py
2222
2daa39e4d59526acb4772b6c47eb315f lib/controller/action.py
@@ -45,14 +45,14 @@ e60456db5380840a586654344003d4e6 lib/core/readlineng.py
4545
5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py
4646
99a2b496b9d5b546b335653ca801153f lib/core/revision.py
4747
7c15dd2777af4dac2c89cab6df17462e lib/core/session.py
48-
5a6d84960ff31279407075c65fc09d7f lib/core/settings.py
48+
a9bda44aa2a28b50254faadb508a6539 lib/core/settings.py
4949
7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py
5050
23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py
5151
c3ace7874a536d801f308cf1fd03df99 lib/core/target.py
5252
d43f059747ffd48952922c94152e2a07 lib/core/testing.py
5353
2cafee22d9f8018e7efff0a5e3178596 lib/core/threads.py
5454
53c15b78e0288274f52410db25406432 lib/core/unescaper.py
55-
6bdc53e2ca152ff8cd35ad671e48a96b lib/core/update.py
55+
60100cb265ae8bb903b760c7b7a3a7f3 lib/core/update.py
5656
8485a3cd94c0a5af2718bad60c5f1ae5 lib/core/wordlist.py
5757
cc9c82cfffd8ee9b25ba3af6284f057e lib/__init__.py
5858
c1288bc4ce5651dbdd82d4a9435fdc03 lib/parse/banner.py

0 commit comments

Comments
 (0)