Merge pull request #1126 from JacobC1921w/master
Usage of `egrep` is becoming obselete. Instead opt for using `grep -E`
This commit is contained in:
commit
3710ef59eb
|
@ -854,7 +854,7 @@ while [ \$AuthenticatorState = \"running\" ]; do
|
||||||
# Aircrack-ng
|
# Aircrack-ng
|
||||||
# Check if we've got the correct password by looking for
|
# Check if we've got the correct password by looking for
|
||||||
# anything other than \"Passphrase not in\" or \"KEY NOT FOUND\".
|
# 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
|
esac
|
||||||
echo "
|
echo "
|
||||||
|
|
|
@ -438,7 +438,7 @@ fluxion_kill_lineage() {
|
||||||
# ============================================================ #
|
# ============================================================ #
|
||||||
# Delete log only in Normal Mode !
|
# Delete log only in Normal Mode !
|
||||||
fluxion_conditional_clear() {
|
fluxion_conditional_clear() {
|
||||||
# Clear iff we're not in debug mode
|
# Clear if we're not in debug mode
|
||||||
if [ ! $FLUXIONDebug ]; then clear; fi
|
if [ ! $FLUXIONDebug ]; then clear; fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,7 @@ function interface_hardware() {
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Check for invalid InterfaceHardwareID (starts or ends with :) .. not a happy face, still won't quote it.
|
# 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 InterfaceHardwareID
|
||||||
unset InterfaceHardwareBus
|
unset InterfaceHardwareBus
|
||||||
return 2
|
return 2
|
||||||
|
|
|
@ -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__info=$(timeout -s SIGTERM 20 curl "$1" 2>/dev/null)
|
||||||
|
|
||||||
local -r __installer_utils_check_version__onlineVersion=$(
|
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=$(
|
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" ] && \
|
if [ "$__installer_utils_check_version__onlineVersion" ] && \
|
||||||
[ "$__installer_utils_check_version__onlineRevision" ]; then
|
[ "$__installer_utils_check_version__onlineRevision" ]; then
|
||||||
|
|
|
@ -16,7 +16,7 @@ if [ -f "/etc/debian_version" ]; then
|
||||||
}
|
}
|
||||||
|
|
||||||
prep_package_manager() {
|
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 missing sources to package manager, please wait."
|
||||||
|
|
||||||
echo "Adding keys.gnupg.net key, please wait."
|
echo "Adding keys.gnupg.net key, please wait."
|
||||||
|
|
Loading…
Reference in New Issue