diff --git a/fluxion.sh b/fluxion.sh index f877fd2..9a185ad 100755 --- a/fluxion.sh +++ b/fluxion.sh @@ -64,18 +64,18 @@ fi ################################### < XTerm Checks > ################################### if [ ! "${DISPLAY:-}" ]; then - echo -e "${CRed}The script should be exected inside a X (graphical) session.$CClr" - exit 2 + echo -e "${CRed}The script should be exected inside a X (graphical) session.$CClr" + exit 2 fi if ! hash xdpyinfo 2>/dev/null; then - echo -e "${CRed}xdpyinfo not installed, please install the relevant package for your distribution.$CClr" - exit 3 + echo -e "${CRed}xdpyinfo not installed, please install the relevant package for your distribution.$CClr" + exit 3 fi if ! xdpyinfo &> /dev/null; then - echo -e "${CRed}The script failed to initialize an xterm test session.$CClr" - exit 3 + echo -e "${CRed}The script failed to initialize an xterm test session.$CClr" + exit 3 fi ################################# < Default Language > ################################# @@ -142,7 +142,7 @@ function fluxion_exitmode() { systemctl restart NetworkManager &> $FLUXIONOutputDevice & fi fi - killall lighttpd + killall lighttpd echo -e "$CWht[$CGrn+$CWht] $CGrn$FLUXIONCleanupSuccessNotice$CClr" echo -e "$CWht[$CGrn+$CWht] $CGry$FLUXIONThanksSupportersNotice$CClr" @@ -170,11 +170,11 @@ function fluxion_conditional_bail() { # ERROR Report only in Developer Mode function fluxion_error_report() { - echo "Error on line $1" + echo "Error on line $1" } if [ "$FLUXIONDebug" ]; then - trap 'fluxion_error_report $LINENUM' ERR + trap 'fluxion_error_report $LINENUM' ERR fi function fluxion_handle_abort_attack() { @@ -218,7 +218,7 @@ function fluxion_header() { # Create working directory if [ ! -d "$FLUXIONWorkspacePath" ]; then - mkdir -p "$FLUXIONWorkspacePath" &> $FLUXIONOutputDevice + mkdir -p "$FLUXIONWorkspacePath" &> $FLUXIONOutputDevice fi ####################################### < Start > ###################################### @@ -440,7 +440,7 @@ function fluxion_run_interface() { local ifSelected="$1" - if [ "$FLUXIONWIReloadDriver" ]; then + if [ "$FLUXIONWIReloadDriver" ]; then # Get selected interface's driver details/info-descriptor. echo -e "$FLUXIONVLine $FLUXIONGatheringWIInfoNotice" @@ -460,26 +460,26 @@ function fluxion_run_interface() { while interface_physical "$ifSelected" do sleep 1 done - fi + fi fi if [ "$FLUXIONWIKillProcesses" ]; then # Get list of potentially troublesome programs. echo -e "$FLUXIONVLine $FLUXIONFindingConflictingProcessesNotice" # This shit has to go reeeeeal soon (airmon-ng)... - local conflictPrograms=($(airmon-ng check | awk 'NR>6{print $2}')) + local conflictPrograms=($(airmon-ng check | awk 'NR>6{print $2}')) # Kill potentially troublesome programs. echo -e "$FLUXIONVLine $FLUXIONKillingConflictingProcessesNotice" for program in "${conflictPrograms[@]}" do killall "$program" &> $FLUXIONOutputDevice - done + done fi if [ "$FLUXIONWIReloadDriver" ]; then # I'm not really sure about this conditional here. # FLUXION 2 had the conditional so I kept it there. - if [ ! "$(echo $ifDriver | egrep 'rt2800|rt73')" ] + if [ ! "$(echo $ifDriver | egrep 'rt2800|rt73')" ] then modprobe "$ifDriver" &> $FLUXIONOutputDevice 2>&1 fi @@ -488,7 +488,7 @@ function fluxion_run_interface() { while ! interface_physical "$ifSelected" do sleep 1 done - fi + fi # Activate wireless interface monitor mode and save identifier. echo -e "$FLUXIONVLine $FLUXIONStartingWIMonitorNotice" @@ -518,7 +518,7 @@ function fluxion_set_scanner() { fi if [ "$FLUXIONAuto" ];then - fluxion_run_scanner $WIMonitor + fluxion_run_scanner $WIMonitor else local choices=("$FLUXIONScannerChannelOptionAll" "$FLUXIONScannerChannelOptionSpecific" "$FLUXIONGeneralBackOption") io_query_choice "$FLUXIONScannerChannelQuery" choices[@] @@ -708,13 +708,13 @@ function fluxion_set_target_ap() { } function fluxion_show_ap_info() { - format_apply_autosize "%*s$CBlu%7s$CClr: %-32b%*s\n" + format_apply_autosize "%*s$CBlu%7s$CClr: %-32b%*s\n" printf "$FormatApplyAutosize" "" "ESSID" "$APTargetSSID / $APTargetEncryption" "" printf "$FormatApplyAutosize" "" "Channel" "$APTargetChannel" "" printf "$FormatApplyAutosize" "" "BSSID" "$APTargetMAC ($CYel${APTargetMaker:-UNKNOWN}$CClr)" "" - echo + echo } @@ -886,7 +886,7 @@ function fluxion_unset_attack() { FLUXIONAttack="" } -# Select attack strategie that will be used +# Select the attack strategy to be used. function fluxion_set_attack() { if [ "$FLUXIONAttack" ]; then return 0; fi @@ -940,6 +940,7 @@ function fluxion_set_attack() { FLUXIONAttack=${IOQueryFormatFields[0]} + # Load attack and its corresponding language file. source "attacks/$FLUXIONAttack/language/$FLUXIONLanguage.sh" source "attacks/$FLUXIONAttack/attack.sh" @@ -953,7 +954,7 @@ function fluxion_set_attack() { # Attack function fluxion_run_attack() { - start_attack + start_attack local choices=("$FLUXIONSelectAnotherAttackOption" "$FLUXIONGeneralExitOption") io_query_choice "`io_dynamic_output $FLUXIONAttackInProgressNotice`" choices[@]