From f7f7a09c2c618507454e1a34fbad5c83b61b5657 Mon Sep 17 00:00:00 2001 From: Jacob Collins Date: Fri, 30 Dec 2022 09:53:49 +1100 Subject: [PATCH 1/6] `egrep` is obsolescent --- attacks/Captive Portal/attack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attacks/Captive Portal/attack.sh b/attacks/Captive Portal/attack.sh index 6313353..ec8b204 100755 --- a/attacks/Captive Portal/attack.sh +++ b/attacks/Captive Portal/attack.sh @@ -854,7 +854,7 @@ while [ \$AuthenticatorState = \"running\" ]; do # Aircrack-ng # Check if we've got the correct password by looking for # anything other than \"Passphrase not in\" or \"KEY NOT FOUND\". - local -r verifiedCondition="aircrack-ng -b $FluxionTargetMAC -w \"$FLUXIONWorkspacePath/candidate.txt\" \"$CaptivePortalHashPath\" | egrep -qi \"Passphrase not in|KEY NOT FOUND\"" + local -r verifiedCondition="aircrack-ng -b $FluxionTargetMAC -w \"$FLUXIONWorkspacePath/candidate.txt\" \"$CaptivePortalHashPath\" | grep -Eqi \"Passphrase not in|KEY NOT FOUND\"" ;; esac echo " From 64cf5f6e5cf58214f154426be286a7e4e6ffe496 Mon Sep 17 00:00:00 2001 From: Jacob Collins Date: Fri, 30 Dec 2022 09:55:14 +1100 Subject: [PATCH 2/6] `egrep` is obsolescent --- lib/InterfaceUtils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/InterfaceUtils.sh b/lib/InterfaceUtils.sh index 8ed1da8..e4a8450 100755 --- a/lib/InterfaceUtils.sh +++ b/lib/InterfaceUtils.sh @@ -99,7 +99,7 @@ function interface_hardware() { esac # Check for invalid InterfaceHardwareID (starts or ends with :) .. not a happy face, still won't quote it. - if echo "$InterfaceHardwareID" | egrep -q "^:|:$"; then + if echo "$InterfaceHardwareID" | grep -Eq "^:|:$"; then unset InterfaceHardwareID unset InterfaceHardwareBus return 2 From d2bf7d533e92bdfd7588d1f6ee4f572fb4f2e865 Mon Sep 17 00:00:00 2001 From: Jacob Collins Date: Fri, 30 Dec 2022 09:56:07 +1100 Subject: [PATCH 3/6] `egrep` is obsolescent --- lib/installer/InstallerUtils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/installer/InstallerUtils.sh b/lib/installer/InstallerUtils.sh index 6e39975..3cc26a9 100755 --- a/lib/installer/InstallerUtils.sh +++ b/lib/installer/InstallerUtils.sh @@ -40,9 +40,9 @@ installer_utils_check_version() { local -r __installer_utils_check_version__info=$(timeout -s SIGTERM 20 curl "$1" 2>/dev/null) local -r __installer_utils_check_version__onlineVersion=$( - echo "$__installer_utils_check_version__info" | egrep "$2" | egrep -o "[0-9]+") + echo "$__installer_utils_check_version__info" | grep -E "$2" | grep -Eo "[0-9]+") local -r __installer_utils_check_version__onlineRevision=$( - echo "$__installer_utils_check_version__info" | egrep "$3" | egrep -o "[0-9]+") + echo "$__installer_utils_check_version__info" | grep -E "$3" | grep -Eo "[0-9]+") if [ "$__installer_utils_check_version__onlineVersion" ] && \ [ "$__installer_utils_check_version__onlineRevision" ]; then From e11dd51d809ab5cdae7683a6bde38d1cfb08436b Mon Sep 17 00:00:00 2001 From: Jacob Collins Date: Fri, 30 Dec 2022 09:57:00 +1100 Subject: [PATCH 4/6] `egrep` is obsolescent --- lib/installer/managers/apt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/installer/managers/apt.sh b/lib/installer/managers/apt.sh index 05cce57..4d1d76e 100755 --- a/lib/installer/managers/apt.sh +++ b/lib/installer/managers/apt.sh @@ -16,7 +16,7 @@ if [ -f "/etc/debian_version" ]; then } prep_package_manager() { - if [ ! "$(cat /etc/apt/sources.list | egrep 'deb http://http.kali.org/kali ((kali-rolling|main|contrib|non-free) )*')" ]; then + if [ ! "$(cat /etc/apt/sources.list | grep -E 'deb http://http.kali.org/kali ((kali-rolling|main|contrib|non-free) )*')" ]; then echo "Adding missing sources to package manager, please wait." echo "Adding keys.gnupg.net key, please wait." From 977e6f1dbe86830abc34fa1a0f5c2b547e745ff5 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 30 Dec 2022 10:23:23 +1100 Subject: [PATCH 5/6] Fixed issue#1116, found hungarian language files weren't set to executable --- attacks/Captive Portal/language/hu.sh | 0 attacks/Handshake Snooper/language/hu.sh | 0 fluxion.sh | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 attacks/Captive Portal/language/hu.sh mode change 100644 => 100755 attacks/Handshake Snooper/language/hu.sh diff --git a/attacks/Captive Portal/language/hu.sh b/attacks/Captive Portal/language/hu.sh old mode 100644 new mode 100755 diff --git a/attacks/Handshake Snooper/language/hu.sh b/attacks/Handshake Snooper/language/hu.sh old mode 100644 new mode 100755 diff --git a/fluxion.sh b/fluxion.sh index 3b2cd81..f3e415f 100755 --- a/fluxion.sh +++ b/fluxion.sh @@ -438,7 +438,7 @@ fluxion_kill_lineage() { # ============================================================ # # Delete log only in Normal Mode ! fluxion_conditional_clear() { - # Clear iff we're not in debug mode + # Clear if we're not in debug mode if [ ! $FLUXIONDebug ]; then clear; fi } From 1b85d3a0f5c1cf9e3c21c01e0179ef474eb3c424 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 30 Dec 2022 10:27:27 +1100 Subject: [PATCH 6/6] Forgot another hungarian language file needs executable flag for issue#1116 --- language/hu.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 language/hu.sh diff --git a/language/hu.sh b/language/hu.sh old mode 100644 new mode 100755