From f76e4857740c36bbd6a4403f4544b89000d2c358 Mon Sep 17 00:00:00 2001 From: Nikolaos Kamarinakis Date: Sat, 11 Mar 2017 15:34:12 +0200 Subject: [PATCH 1/6] Fix Expression README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 4712341..710419a 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ Authors: `Nikolaos Kamarinakis `_ & `David Schütz ------------- -Installation on Debian based systems +Debian Installation ---------------------- You can download KickThemOut by cloning the `Git Repo `_ and simply installing its requirements:: From 78f7401e64e72da654ff9e28e3c98bc57c84d8e1 Mon Sep 17 00:00:00 2001 From: k4m4 Date: Sun, 26 Mar 2017 16:41:15 +0300 Subject: [PATCH 2/6] Fix error message terminology --- kickthemout.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kickthemout.py b/kickthemout.py index e1bffa6..64b4190 100644 --- a/kickthemout.py +++ b/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}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}ERROR: Requirements have not been satisfied properly. Please look at the README file for configuration instructions.").format(RED) + 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(): From db968a5ee842d7e71f30a187298140a69d3f60f7 Mon Sep 17 00:00:00 2001 From: k4m4 Date: Sun, 26 Mar 2017 21:28:13 +0300 Subject: [PATCH 3/6] Add issue template to .github dir --- .github/ISSUE_TEMPLATE.md | 27 +++++++++++++++++++++++++++ scan.py | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..b0289a4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,27 @@ + + + + +- [ ] 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. + + + +- **OS name & version**: +- **Python version**: +- **Scapy version**: +- **Nmap version**: +- **Link of a [Gist](https://gist.github.com/) with the response of a `$ sudo python -vvv kickthemout.py` command`**: + +## Issue + diff --git a/scan.py b/scan.py index 5889d16..6aab984 100644 --- a/scan.py +++ b/scan.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -.- coding: utf-8 -.- # scan.py -# author: xdavidhu +# authors: k4m4 & xdavidhu def scanNetwork(network): returnlist = [] From 4087eaa5b05c715c6b1c59b1234c0066262eb5bf Mon Sep 17 00:00:00 2001 From: k4m4 Date: Sun, 26 Mar 2017 21:32:41 +0300 Subject: [PATCH 4/6] Fix issue_template terminology --- .github/ISSUE_TEMPLATE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index b0289a4..ef9295d 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -21,7 +21,8 @@ - **Python version**: - **Scapy version**: - **Nmap version**: -- **Link of a [Gist](https://gist.github.com/) with the response of a `$ sudo python -vvv kickthemout.py` command`**: + +- **Link of [Gist](https://gist.github.com/): ## Issue From 4bf6e12999bdfcb4f1af7770ed42e63f976444de Mon Sep 17 00:00:00 2001 From: k4m4 Date: Sun, 26 Mar 2017 21:34:00 +0300 Subject: [PATCH 5/6] Fix issue_template typo --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index ef9295d..85890a1 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -22,7 +22,7 @@ - **Scapy version**: - **Nmap version**: -- **Link of [Gist](https://gist.github.com/): +- **Link of [Gist](https://gist.github.com/)**: ## Issue From dc17b0a6ffa9759f2853be490e9d3041221e854a Mon Sep 17 00:00:00 2001 From: k4m4 Date: Sun, 26 Mar 2017 22:18:07 +0300 Subject: [PATCH 6/6] Fix issue_template typo --- .github/ISSUE_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 85890a1..95d8e64 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,8 +2,8 @@ Hi there! Thank you for bringing an issue to out attention. Before submitting, let's make sure of a few things. - Please make sure the following boxes are ticked if they apply. - If they do not, please try and fulfil these first. + Please ensure the following boxes are ticked if they apply. + If they do not, please try and fulfill them first. -->