Skip to content

Commit

Permalink
Merge pull request #102 from v1s1t0r1sh3r3/dev
Browse files Browse the repository at this point in the history
Dev to master, v7.21
  • Loading branch information
OscarAkaElvis authored Sep 17, 2017
2 parents 800ffb8 + 87b0775 commit 6d1f82d
Show file tree
Hide file tree
Showing 20 changed files with 879 additions and 439 deletions.
19 changes: 19 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# EditorConfig is awesome: http://EditorConfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true

[*.{sh,db,txt}]
trim_trailing_whitespace = true

[*.{sh,db}]
indent_style = tab
indent_size = 2

[Dockerfile]
indent_style = tab
indent_size = 2
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--- Please, answer the questions to provide maximum of info -->
<!--- Answer in English only -->
<!--- If additional info is required and requested by airgeddon's staff, you have 10 days to respond otherwise the issue will be closed -->
<!--- Write in English only -->
<!--- If additional info is required and requested by airgeddon's staff, you have 7 days to respond, otherwise the issue will be closed -->

#### What is your airgeddon version?

Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### 7.21
- Italian language translation added (Thank you to "salu90")
- Tested compatibility with Parrot 3.7, Fedora 26 and Wifislax 64-1.1
- Improved check for root permissions, now mandatory
- Fixed bug for some menu inputs using special chars. Now sanitized
- Code improvements, removed new shellcheck warnings
- Fixed bug launching BeEF Evil Twin attack twice

### 7.2
- Improved chipset detection
- New language and options menu
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Hi there! We are thrilled that you would like to contribute to this project. You

When contributing to this repository, please first discuss the change you wish to make via issue,
email, or any other method with the owners of this repository before making a change.
If an issue is opened and more info is needed, `airgeddon` staff will request it. If there is no answer in 10 days, the issue will be closed.
If an issue is opened and more info is needed, `airgeddon` staff will request it. If there is no answer in 7 days, the issue will be closed.

Please note we have a code of conduct, please follow it in all your interactions with the project.

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ RUN \
#Clean files
RUN rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
rm -rf /opt/airgeddon/.github > /dev/null 2>&1 && \
rm -rf /opt/airgeddon/.editorconfig > /dev/null 2>&1 && \
rm -rf /opt/airgeddon/CONTRIBUTING.md > /dev/null 2>&1 && \
rm -rf /opt/airgeddon/pindb_checksum.txt > /dev/null 2>&1 && \
rm -rf /opt/airgeddon/Dockerfile > /dev/null 2>&1 && \
Expand All @@ -139,5 +140,5 @@ RUN rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
#Expose BeEF control panel port
EXPOSE 3000

#Entrypoint
#Start command (launching airgeddon)
CMD ["/bin/bash", "-c", "/opt/airgeddon/airgeddon.sh"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ 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-7.2-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
[Version-shield]: https://img.shields.io/badge/version-7.21-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!"
Expand Down
Loading

0 comments on commit 6d1f82d

Please sign in to comment.