Skip to content

Commit

Permalink
Merge pull request #337 from v1s1t0r1sh3r3/dev
Browse files Browse the repository at this point in the history
Dev to master v10.01
  • Loading branch information
OscarAkaElvis authored Jan 8, 2020
2 parents 15405d7 + f222b9d commit dfee46c
Show file tree
Hide file tree
Showing 15 changed files with 294 additions and 210 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### 10.01
- Removed deprecated ifconfig and iwconfig commands and dependencies
- Fixed error on enterprise certificates validation
- Added autoselection for secondary interface if only one existing
- Airmon compatibility check system refactored
- Fixed error in default paths trophy files for ettercap/bettercap

### 10.0
- Added plugins system
- Added example plugin: Missing dependencies auto-installation for some distros (Kali, Parrot, BlackArch)
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Please note we have a [Code of Conduct], please follow it in all your interactio
3. Translate the strings located in `language_strings.sh` and the existing phrases _language_strings_handling_messages function_ in `airgeddon.sh`.
4. If you want to create a pull request with a new language to be added, at least the 80% of the phrases must be translated and the rest must be done with at least _an automatic-translation_ system and marked with PoT (Pending of Translation) mark.
5. Remember that pull requests done over master branch will be rejected. Read the git workflow policy first.
6. After verification of and acceptation of the pull request, you can be added as a collaborator on the project to push directly on the repository instead of making pull requests.
6. After verification of and acceptation of the pull request, you can be added as a collaborator on the project to push directly on the repository instead of submitting pull requests.
7. Knowledge about `git` is mandatory (at least basic commands) to push directly into the project repository.

## Collaborating Developers and Plugins Development
Expand All @@ -46,12 +46,12 @@ Please note we have a [Code of Conduct], please follow it in all your interactio
8. Direct push to [Master] is not allowed. Pull Requests to [Master] are not allowed. Should be done over [Dev] or any other branch. They require revision and approvement. Read the git workflow policy first.
9. All the development and coding must be in English.

*Be sure to merge the latest from "upstream" before making a pull request!*
*Be sure to merge the latest from "upstream" before submitting a pull request!*

#### For plugins development:

1. Read carefully the [Wiki Plugins Development Section].
2. Plugins Pull Requests will be never accepted. Plugins MUST be external to this repository.
2. Plugins Pull Requests will never be accepted. Plugins MUST be external to this repository.
3. Develop your plugin following the guidelines and using the plugin template to keep the needed structure.
4. If you want to add your plugin to [Wiki Plugins Hall of Fame Section], follow the instructions explained there. Don't open an issue.

Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ ENV LC_ALL="en_US.UTF-8"
RUN \
apt -y install \
gawk \
net-tools \
wireless-tools \
iw \
aircrack-ng \
xterm \
Expand Down Expand Up @@ -90,7 +88,7 @@ RUN \
john \
openssl

#Install needed Ruby gems
#Install needed dependencies for Bettercap and BeEF
RUN \
apt -y install \
beef-xss \
Expand All @@ -99,7 +97,8 @@ RUN \
ruby-colorize \
ruby-net-dns \
ruby-em-proxy \
ruby-network-interface
ruby-network-interface \
net-tools

#Env var for display
ENV DISPLAY=":0"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
[Hat Tip To]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Hat%20Tip%20To
[Inspiration]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Inspiration

[Version-shield]: https://img.shields.io/badge/version-10.0-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
[Version-shield]: https://img.shields.io/badge/version-10.01-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
[Bash4.2-shield]: https://img.shields.io/badge/bash-4.2%2B-blue.svg?style=flat-square&colorA=273133&colorB=00db00 "Bash 4.2 or later"
[License-shield]: https://img.shields.io/badge/license-GPL%20v3%2B-blue.svg?style=flat-square&colorA=273133&colorB=bd0000 "GPL v3+"
[Docker-shield]: https://img.shields.io/docker/automated/v1s1t0r1sh3r3/airgeddon.svg?style=flat-square&colorA=273133&colorB=f9ff5a "Docker rules!"
[Docker-shield]: https://img.shields.io/docker/cloud/automated/v1s1t0r1sh3r3/airgeddon.svg?style=flat-square&colorA=273133&colorB=a9a9a9 "Docker rules!"
[Paypal-shield]: https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&colorA=273133&colorB=b008bb "Paypal"
[Cryptocurrencies-shield]: https://img.shields.io/badge/donate-cryptocurrencies-blue.svg?style=flat-square&colorA=273133&colorB=f7931a "Cryptocurrencies"
Loading

0 comments on commit dfee46c

Please sign in to comment.