mirror of
https://github.com/firehol/firehol.git
synced 2024-06-30 19:02:21 +00:00
replaced sed and tr commands with variables
This commit is contained in:
parent
0acbdd18b9
commit
a934778b83
12
firehol.sh
12
firehol.sh
@ -3179,11 +3179,11 @@ check_kernel_config() {
|
|||||||
eval local kcfg1="\$${1}"
|
eval local kcfg1="\$${1}"
|
||||||
|
|
||||||
# without _IP_
|
# without _IP_
|
||||||
local t=`echo ${1} | sed "s/_IP_//g"`
|
local t=`echo ${1} | ${SED_CMD} "s/_IP_//g"`
|
||||||
eval local kcfg2="\$${t}"
|
eval local kcfg2="\$${t}"
|
||||||
|
|
||||||
# _CONNTRACK_ as _CT_
|
# _CONNTRACK_ as _CT_
|
||||||
local t=`echo ${1} | sed "s/_CONNTRACK_/_CT_/g"`
|
local t=`echo ${1} | ${SED_CMD} "s/_CONNTRACK_/_CT_/g"`
|
||||||
eval local kcfg3="\$${t}"
|
eval local kcfg3="\$${t}"
|
||||||
|
|
||||||
# prefer the kernel 2.6.20+ way
|
# prefer the kernel 2.6.20+ way
|
||||||
@ -4132,7 +4132,7 @@ rule() {
|
|||||||
srctypenot="!"
|
srctypenot="!"
|
||||||
fi
|
fi
|
||||||
test ${softwarnings} -eq 1 -a ! "${srctype}" = "" && softwarning "Overwritting param: srctype '${srctype}' becomes '${1}'"
|
test ${softwarnings} -eq 1 -a ! "${srctype}" = "" && softwarning "Overwritting param: srctype '${srctype}' becomes '${1}'"
|
||||||
srctype="`echo ${1} | sed "s|^ \+||" | sed "s| \+\$||" | sed "s| \+|,|g" | tr a-z A-Z`"
|
srctype="`echo ${1} | ${SED_CMD} -e "s|^ \+||" -e "s| \+\$||" -e "s| \+|,|g" | ${TR_CMD} a-z A-Z`"
|
||||||
else
|
else
|
||||||
dsttypenot=
|
dsttypenot=
|
||||||
if [ "${1}" = "not" -o "${1}" = "NOT" ]
|
if [ "${1}" = "not" -o "${1}" = "NOT" ]
|
||||||
@ -4141,7 +4141,7 @@ rule() {
|
|||||||
dsttypenot="!"
|
dsttypenot="!"
|
||||||
fi
|
fi
|
||||||
test ${softwarnings} -eq 1 -a ! "${dsttype}" = "" && softwarning "Overwritting param: dsttype '${dsttype}' becomes '${1}'"
|
test ${softwarnings} -eq 1 -a ! "${dsttype}" = "" && softwarning "Overwritting param: dsttype '${dsttype}' becomes '${1}'"
|
||||||
dsttype="`echo ${1} | sed "s|^ \+||" | sed "s| \+\$||" | sed "s| \+|,|g" | tr a-z A-Z`"
|
dsttype="`echo ${1} | ${SED_CMD} -e "s|^ \+||" -e "s| \+\$||" -e "s| \+|,|g" | ${TR_CMD} a-z A-Z`"
|
||||||
fi
|
fi
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
@ -4157,7 +4157,7 @@ rule() {
|
|||||||
dsttypenot="!"
|
dsttypenot="!"
|
||||||
fi
|
fi
|
||||||
test ${softwarnings} -eq 1 -a ! "${dsttype}" = "" && softwarning "Overwritting param: dsttype '${dsttype}' becomes '${1}'"
|
test ${softwarnings} -eq 1 -a ! "${dsttype}" = "" && softwarning "Overwritting param: dsttype '${dsttype}' becomes '${1}'"
|
||||||
dsttype="`echo ${1} | sed "s|^ \+||" | sed "s| \+\$||" | sed "s| \+|,|g" | tr a-z A-Z`"
|
dsttype="`echo ${1} | ${SED_CMD} -e "s|^ \+||" -e "s| \+\$||" -e "s| \+|,|g" | ${TR_CMD} a-z A-Z`"
|
||||||
else
|
else
|
||||||
srctypenot=
|
srctypenot=
|
||||||
if [ "${1}" = "not" -o "${1}" = "NOT" ]
|
if [ "${1}" = "not" -o "${1}" = "NOT" ]
|
||||||
@ -4166,7 +4166,7 @@ rule() {
|
|||||||
srctypenot="!"
|
srctypenot="!"
|
||||||
fi
|
fi
|
||||||
test ${softwarnings} -eq 1 -a ! "${srctype}" = "" && softwarning "Overwritting param: srctype '${srctype}' becomes '${1}'"
|
test ${softwarnings} -eq 1 -a ! "${srctype}" = "" && softwarning "Overwritting param: srctype '${srctype}' becomes '${1}'"
|
||||||
srctype="`echo ${1} | sed "s|^ \+||" | sed "s| \+\$||" | sed "s| \+|,|g" | tr a-z A-Z`"
|
srctype="`echo ${1} | ${SED_CMD} -e "s|^ \+||" -e "s| \+\$||" -e "s| \+|,|g" | ${TR_CMD} a-z A-Z`"
|
||||||
fi
|
fi
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user