Skip to content

Commit

Permalink
Merge pull request #1126 from JacobC1921w/master
Browse files Browse the repository at this point in the history
Usage of `egrep` is becoming obselete. Instead opt for using `grep -E`
  • Loading branch information
strasharo authored Jan 23, 2023
2 parents 8c2680f + 1b85d3a commit 3710ef5
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion attacks/Captive Portal/attack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
Empty file modified attacks/Captive Portal/language/hu.sh
100644 → 100755
Empty file.
Empty file modified attacks/Handshake Snooper/language/hu.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion fluxion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Empty file modified language/hu.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion lib/InterfaceUtils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/installer/InstallerUtils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/installer/managers/apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 3710ef5

Please sign in to comment.