Merge branch 'master' into universal-interface

This commit is contained in:
Matias Barcenas 2017-09-08 15:14:07 -05:00 committed by GitHub
commit 6b1e3ffb21
3 changed files with 13 additions and 5 deletions

View File

@ -1,7 +1,7 @@
![Fuxion logo](https://github.com/FluxionNetwork/fluxion/raw/master/logos/logo.jpg)
# Fluxion is the future of MITM WPA attacks
Fluxion is a remake of linset by vk496 with (hopefully) less bugs and more functionality. It's compatible with the latest release of Kali (rolling). The attack is mostly manual, but experimental versions will automatically handle most functionality from the stable releases.
Fluxion is a remake of linset by vk496 with (hopefully) less bugs and more functionality. It's compatible with the latest release of Kali (rolling). The attack is mostly manual, but experimental versions will automatically handle most functionality from the stable releases. Read the [FAQ](https://github.com/FluxionNetwork/fluxion/wiki/FAQ) before requesting issues.
## Router login page
Share your own router page with a simple script
@ -10,8 +10,6 @@ cd scripts
sudo sh router.sh
```
[FAQ](https://github.com/FluxionNetwork/fluxion/wiki/FAQ)
## Installation
```
git clone --recursive https://github.com/FluxionNetwork/fluxion.git # Download the latest revision
@ -42,6 +40,8 @@ All contributions are welcome! Code, documentation, graphics or even design sugg
* Each submitted password is verified by the handshake captured earlier
* The attack will automatically terminate, as soon as a correct password is submitted
* For a guide to the `Captive Portal` attack, read the [Captive Portal attack guide](https://github.com/FluxionNetwork/fluxion/wiki/Captive-Portal-Attack)
## :heavy_exclamation_mark: Requirements
A Linux-based operating system. We recommend Kali Linux 2 or Kali 2016.1 rolling. Kali 2 & 2016 support the latest aircrack-ng versions. An external wifi card is recommended.

View File

@ -336,8 +336,10 @@ function fluxion_set_resolution() { # Windows + Resolution
}
##################################### < Language > #####################################
function fluxion_set_language() {
if [ ! "$FLUXIONAuto" ]; then
function set_language() {
if [ "$FLUXIONAuto" ]; then
FLUXIONLanguage="en"
else
# Get all languages available.
local languageCodes
readarray -t languageCodes < <(ls -1 language | sed -E 's/\.sh//')

6
scripts/preferences.sh Normal file
View File

@ -0,0 +1,6 @@
#!/bin/bash
# export FLUXIONAuto=1
# export FLUXIONDebug=1
# export FLUXIONWIKillProcesses=1
# export FLUXIONWIReloadDriver=1