Merge pull request #9 from k4m4/master

Fork update

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+<!--
+  Hi there! Thank you for bringing an issue to out attention.
+
+  Before submitting, let's make sure of a few things.
+  Please ensure the following boxes are ticked if they apply.
+  If they do not, please try and fulfill them first.
+-->
+
+<!-- Checked checkbox should look like this: [x] -->
+
+- [ ] I have carefully read the [README](https://github.com/k4m4/kickthemout/blob/master/README.rst) file and haven't managed to resolve my issue.
+- [ ] I have searched the [issues](https://github.com/k4m4/kickthemout/issues?utf8=%E2%9C%93&q=is%3Aissue) of this repo and believe that this is not a duplicate.
+- [ ] I am running the latest version of KickThemOut.
+
+<!-- 
+  Once all boxes are ticked, it would be very helpful if you could fill in the
+  following list with the appropriate information. 
+--> 
+
+- **OS name & version**: <!-- Replace with os name & version -->
+- **Python version**: <!-- Replace with python version -->
+- **Scapy version**: <!-- Replace with scapy version -->
+- **Nmap version**: <!-- Replace with nmap version -->
+<!-- Please create a Gist with the response of a `$ sudo python -vvv kickthemout.py` verbosity command -->
+- **Link of [Gist](https://gist.github.com/)**: <!-- Replace with gist link -->  
+
+## Issue
+<!-- Now feel free to write about your issue; please remember to be as descriptive as possible! Thanks again! 🙌 ❤️ -->

README.rst

@@ -23,7 +23,7 @@ Authors: `Nikolaos Kamarinakis <mailto:nikolaskam@gmail.com>`_  & `David Schütz
     
 -------------
 
-Installation on Debian based systems
+Debian Installation
 ----------------------
 
 You can download KickThemOut by cloning the `Git Repo <https://github.com/k4m4/kickthemout>`_ and simply installing its requirements::

kickthemout.py

@@ -16,7 +16,7 @@ BLUE, RED, WHITE, YELLOW, MAGENTA, GREEN, END = '\33[94m', '\033[91m', '\33[97m'
 notRoot = False
 try:
     if os.geteuid() != 0:
-        print("\n{0}ERROR: KickThemOut must run as root. Try again with sudo/root:\n\t{1}$ sudo python kickthemout.py{2}\n").format(RED, GREEN, END)
+        print("\n{0}ERROR: KickThemOut must be run with root privileges. Try again with sudo:\n\t{1}$ sudo python kickthemout.py{2}\n").format(RED, GREEN, END)
         notRoot = True
 except:
     # User is probably on windows
@@ -29,8 +29,8 @@ try:
     from scapy.all import *
     import scan, spoof
 except:
-    print("\n{0}ERROR: Requirements have not been properly satisfied. Please try running:\n\t{1}$ sudo pip install -r requirements.txt{2}").format(RED, GREEN, END)
+    print("\n{0}ERROR: Requirements have not been satisfied properly. Please look at the README file for configuration instructions.").format(RED)
-    print("\n{0}If you still get the same error, please submit an issue here:\n\t{1}https://github.com/k4m4/kickthemout/issues\n{2}").format(RED, BLUE, END)
+    print("\n{0}If you still cannot resolve this error, please submit an issue here:\n\t{1}https://github.com/k4m4/kickthemout/issues\n{2}").format(RED, BLUE, END)
     raise SystemExit
 
 def heading():

scan.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -.- coding: utf-8 -.-
 # scan.py
-# author: xdavidhu
+# authors: k4m4 & xdavidhu
 
 def scanNetwork(network):
     returnlist = []