Minor bug fix and removal of outdated content.

fluxion

@@ -1504,9 +1504,11 @@ fluxion_prep_attack() {
   if [ ! -x "$path/language/$FluxionLanguage.sh" ]; then return 2; fi
 
   # Load attack and its corresponding language file.
-  # Notice: If the attack is a targetted attack, sourcing
+  # Load english by default to overwrite globals that ARE defined.
-  # will define the constant FLUXIONAttackTargetted.
+  source "$path/language/en.sh"
-  source "$path/language/$FluxionLanguage.sh"
+  if [ "$FluxionLanguage" != "en" ]; then
+    source "$path/language/$FluxionLanguage.sh"
+  fi
   source "$path/attack.sh"
 
   # Check if attack is targetted & set the attack target if so.
@@ -1544,20 +1546,6 @@ fluxion_run_attack() {
 }
 
 
-# ============================================================ #
-# =================== < Test Subroutines > =================== #
-# ============================================================ #
-subtest1() {
-  local interface
-  interface_list_all
-  for interface in "${InterfaceListAll[@]}"; do
-    if [ "$interface" = "lo" ]; then continue; fi
-    echo "$interface"
-  done
-}
-
-
-
 # ============================================================ #
 # ================= < Argument Executables > ================= #
 # ============================================================ #
@@ -1566,36 +1554,6 @@ eval set -- "$FLUXIONCLIArguments" # Set environment parameters.
 while [ "$1" != "--" ]; do
   case "$1" in
     -t|--target) echo "Not yet implemented!"; sleep 3; fluxion_shutdown;;
-    --test)
-      while true; do
-        fluxion_get_interface subtest1
-        result=$?
-        if [ $result -ne 0 ]; then
-          echo Failed to get interface with code $result
-          exit
-        fi
-
-        fluxion_allocate_interface "$FluxionInterfaceSelected"
-        result=$?
-        if [ $result -ne 0 ]; then
-          echo Failed to allocate "$FluxionInterfaceSelected" with code $result
-          exit
-        fi
-        interfaceA=${FluxionInterfaces["$FluxionInterfaceSelected"]}
-
-        echo "Allocated $FluxionInterfaceSelected -> $interfaceA"
-
-        fluxion_get_target $interfaceA
-        result=$?
-        if [ $result -ne 0 ]; then
-          echo Failed to get target with code $result
-          exit
-        fi
-
-        fluxion_target_show
-      done
-      exit
-    ;;
   esac
   shift # Shift new parameters
 done

language/en.sh

@@ -53,10 +53,6 @@ FLUXIONScannerChannelMiltipleTip="Multiple channels"
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONScannerHeader="FLUXION Scanner"
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-FLUXIONAPServiceQuery="Select an access point service"
-FLUXIONAPServiceHostapdOption="Rogue AP - hostapd (${CGrn}recommended$CClr)"
-FLUXIONAPServiceAirbaseOption="Rogue AP - airbase-ng (${CYel}slow$CClr)"
-# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONHashSourceQuery="Select a method to retrieve the handshake"
 FLUXIONHashSourcePathOption="Path to capture file"
 FLUXIONHashSourceRescanOption="Rescan handshake directory"