From 8d9362cc63515653e8974908b164c8b30865a889 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Wed, 3 Jul 2019 15:03:47 +0200 Subject: [PATCH] FIX check_wildcard in setup-ngxblocker --- .dev-tools/setup-ngxblocker/commented/centos.conf | 2 +- .dev-tools/setup-ngxblocker/setup-ngxblocker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.dev-tools/setup-ngxblocker/commented/centos.conf b/.dev-tools/setup-ngxblocker/commented/centos.conf index 78e728cd7..e16a94a92 100644 --- a/.dev-tools/setup-ngxblocker/commented/centos.conf +++ b/.dev-tools/setup-ngxblocker/commented/centos.conf @@ -33,7 +33,7 @@ http { # Load modular configuration files from the /etc/nginx/conf.d directory. # See http://nginx.org/en/docs/ngx_core_module.html#include # for more information. - #include /etc/nginx/conf.d/*.conf; + include /etc/nginx/conf.d/*.conf; server { listen 80 default_server; diff --git a/.dev-tools/setup-ngxblocker/setup-ngxblocker b/.dev-tools/setup-ngxblocker/setup-ngxblocker index 721c3767f..f57f46384 100644 --- a/.dev-tools/setup-ngxblocker/setup-ngxblocker +++ b/.dev-tools/setup-ngxblocker/setup-ngxblocker @@ -175,7 +175,7 @@ longest_str() { check_wildcard() { local file=$1 dir=$(basename $2) - local check="$(grep -E "include[[:alnum:] /]+$dir/\*" $file)" + local check="$(grep -E "^[^#]+include[[:alnum:] /]+$dir/\*" $file)" echo $check }