|
|
@@ -2617,10 +2617,10 @@ _checkConf() {
|
|
|
_isRealNginxConf() {
|
|
|
_debug "_isRealNginxConf $1 $2"
|
|
|
if [ -f "$2" ]; then
|
|
|
- for _fln in $(grep -n "^ *server_name.* $1" "$2" | cut -d : -f 1); do
|
|
|
+ for _fln in $(tr "\t" ' ' <"$2" | grep -n "^ *server_name.* $1" | cut -d : -f 1); do
|
|
|
_debug _fln "$_fln"
|
|
|
if [ "$_fln" ]; then
|
|
|
- _start=$(cat "$2" | _head_n "$_fln" | grep -n "^ *server *{" | _tail_n 1)
|
|
|
+ _start=$(tr "\t" ' ' <"$2" | _head_n "$_fln" | grep -n "^ *server *{" | _tail_n 1)
|
|
|
_debug "_start" "$_start"
|
|
|
_start_n=$(echo "$_start" | cut -d : -f 1)
|
|
|
_start_nn=$(_math $_start_n + 1)
|
|
|
@@ -2629,8 +2629,8 @@ _isRealNginxConf() {
|
|
|
|
|
|
_left="$(sed -n "${_start_nn},99999p" "$2")"
|
|
|
_debug2 _left "$_left"
|
|
|
- if echo "$_left" | grep -n "^ *server *{" >/dev/null; then
|
|
|
- _end=$(echo "$_left" | grep -n "^ *server *{" | _head_n 1)
|
|
|
+ if echo "$_left" | tr "\t" ' ' | grep -n "^ *server *{" >/dev/null; then
|
|
|
+ _end=$(echo "$_left" | tr "\t" ' ' | grep -n "^ *server *{" | _head_n 1)
|
|
|
_debug "_end" "$_end"
|
|
|
_end_n=$(echo "$_end" | cut -d : -f 1)
|
|
|
_debug "_end_n" "$_end_n"
|
neil