Merge branch 'master' into dev-beta

README.md

@@ -149,6 +149,22 @@ misc arguments:
   --whitelist PATH      only exploit hosts listed in the whitelist file
 ```
 
+If you want to run AutoSploit on a macOS system, AutoSploit is compatible with macOS, however, you have to be inside a virtual environment for it to run successfully. To do this, do the following;
+
+```bash
+sudo -s << '_EOF' 
+pip2 install virtualenv --user
+git clone https://github.com/NullArray/AutoSploit.git
+virtualenv <PATH-TO-YOUR-ENV>
+source <PATH-TO-YOUR-ENV>/bin/activate
+cd <PATH-TO-AUTOSPLOIT>
+pip2 install -r requirements.txt
+chmod +x install.sh
+./install.sh
+python autosploit.py
+_EOF
+```
+
 ## Dependencies
 _Note_: All dependencies should be installed using the above installation method, however, if you find they are not:
 

lib/cmdline/cmd.py

@@ -26,7 +26,8 @@ def optparser():
 
         parser = argparse.ArgumentParser(
             usage="python autosploit.py -[c|z|s|a] -[q] QUERY\n"
-                  "{spacer}[-C] WORKSPACE LHOST LPORT [-e] [--whitelist]\n"
+
+                  "{spacer}[-C] WORKSPACE LHOST LPORT [-e] [--whitewash] PATH\n"
                   "{spacer}[--ruby-exec] [--msf-path] PATH [-E] EXPLOIT-FILE-PATH\n"
                   "{spacer}[--rand-agent] [--proxy] PROTO://IP:PORT [-P] AGENT".format(
                     spacer=" " * 28