Merge branch 'v4-development' of github.com:FluxionNetwork/fluxion into v4-development

This commit is contained in:
Matias Barcenas 2018-01-19 15:55:07 -06:00
commit 58a6dc10c3
2 changed files with 2 additions and 0 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
*.swo *.swo
*.cap *.cap
*.log *.log
*.backup
BullyOutput.txt BullyOutput.txt
/preferences.sh* /preferences.sh*

View File

@ -105,6 +105,7 @@ while [ "$1" != "--" ]; do
-r|--reloader) declare -r FLUXIONWIReloadDriver=1;; -r|--reloader) declare -r FLUXIONWIReloadDriver=1;;
-n|--airmon-ng) declare -r FLUXIONAirmonNG=1;; -n|--airmon-ng) declare -r FLUXIONAirmonNG=1;;
-m|--multiplexer) declare -r FLUXIONTMux=1;; -m|--multiplexer) declare -r FLUXIONTMux=1;;
-a|--auto) declare -r FLUXIONTAuto=1;;
-b|--bssid) FluxionTargetMAC=$2; shift;; -b|--bssid) FluxionTargetMAC=$2; shift;;
-e|--essid) FluxionTargetSSID=$2; shift;; -e|--essid) FluxionTargetSSID=$2; shift;;
-c|--channel) FluxionTargetChannel=$2; shift;; -c|--channel) FluxionTargetChannel=$2; shift;;