Skip to content

Commit 353a625

Browse files
committed
Adding faketty for Github Actions
1 parent 94706bd commit 353a625

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
python-version: [ '2.x', '3.x', 'pypy-2.7', 'pypy-3.6', 'pypy-3.7' ]
1414
steps:
1515
- uses: actions/checkout@v2
16+
- name: faketty
17+
uses: Yuri6037/Action-FakeTTY@v1.1
1618
- name: Set up Python
1719
uses: actions/setup-python@v2
1820
with:

lib/core/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from thirdparty.six import unichr as _unichr
2121

2222
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
23-
VERSION = "1.5.9.14"
23+
VERSION = "1.5.9.15"
2424
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2525
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2626
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/core/testing.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def _thread():
143143
for tag, value in (("<url>", url), ("<base>", base), ("<direct>", direct), ("<tmpdir>", tmpdir), ("<request>", request), ("<log>", log), ("<multiple>", multiple), ("<config>", config), ("<base64>", url.replace("id=1", "id=MZ=%3d"))):
144144
options = options.replace(tag, value)
145145

146-
cmd = "%s \"%s\" %s --batch --non-interactive --testing --debug" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "sqlmap.py")), options)
146+
cmd = "%s \"%s\" %s --batch --non-interactive --debug" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "sqlmap.py")), options)
147147

148148
if "<tmpfile>" in cmd:
149149
handle, tmp = tempfile.mkstemp()
@@ -153,7 +153,6 @@ def _thread():
153153
if "<piped>" in cmd:
154154
cmd = re.sub(r"<piped>\s*", "", cmd)
155155
cmd = "echo %s | %s" % (url, cmd)
156-
cmd = cmd.replace("--testing ", "")
157156

158157
output = shellExec(cmd)
159158

lib/parse/cmdline.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -815,9 +815,6 @@ def cmdLineParser(argv=None):
815815
parser.add_argument("--non-interactive", dest="nonInteractive", action="store_true",
816816
help=SUPPRESS)
817817

818-
parser.add_argument("--testing", dest="testing", action="store_true",
819-
help=SUPPRESS)
820-
821818
parser.add_argument("--gui", dest="gui", action="store_true",
822819
help=SUPPRESS)
823820

@@ -1063,7 +1060,7 @@ def _format_action_invocation(self, action):
10631060
if args.dummy:
10641061
args.url = args.url or DUMMY_URL
10651062

1066-
if hasattr(sys.stdin, "fileno") and not os.isatty(sys.stdin.fileno()) and '-' not in sys.argv and "--testing" not in sys.argv:
1063+
if hasattr(sys.stdin, "fileno") and not os.isatty(sys.stdin.fileno()) and '-' not in sys.argv:
10671064
args.stdinPipe = iter(sys.stdin.readline, None)
10681065
else:
10691066
args.stdinPipe = None

0 commit comments

Comments
 (0)