Minor fixes for MacOSX

This commit is contained in:
Bernardo Damele 2009-05-12 20:24:00 +00:00
parent 06cc2a6d70
commit b463205544
2 changed files with 3 additions and 2 deletions

View File

@ -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))

View File

@ -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: