mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-25 19:13:48 +03:00
Minor fixes for MacOSX
This commit is contained in:
parent
06cc2a6d70
commit
b463205544
|
@ -325,12 +325,13 @@ def __setMetasploit():
|
||||||
|
|
||||||
envPaths = os.environ["PATH"]
|
envPaths = os.environ["PATH"]
|
||||||
|
|
||||||
if "win" in PLATFORM:
|
if "darwin" not in PLATFORM and "win" in PLATFORM:
|
||||||
envPaths = envPaths.split(";")
|
envPaths = envPaths.split(";")
|
||||||
else:
|
else:
|
||||||
envPaths = envPaths.split(":")
|
envPaths = envPaths.split(":")
|
||||||
|
|
||||||
for envPath in envPaths:
|
for envPath in envPaths:
|
||||||
|
envPath = envPath.replace(";", "")
|
||||||
condition = os.path.exists(os.path.normpath(envPath))
|
condition = os.path.exists(os.path.normpath(envPath))
|
||||||
condition &= os.path.exists(os.path.normpath("%s/msfcli" % envPath))
|
condition &= os.path.exists(os.path.normpath("%s/msfcli" % envPath))
|
||||||
condition &= os.path.exists(os.path.normpath("%s/msfconsole" % envPath))
|
condition &= os.path.exists(os.path.normpath("%s/msfconsole" % envPath))
|
||||||
|
|
|
@ -49,7 +49,7 @@ except ImportError:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
haveReadline = False
|
haveReadline = False
|
||||||
|
|
||||||
if 'win' in PLATFORM and haveReadline:
|
if 'win' in PLATFORM and 'darwin' not in PLATFORM and haveReadline:
|
||||||
try:
|
try:
|
||||||
_outputfile=_rl.GetOutputFile()
|
_outputfile=_rl.GetOutputFile()
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user