Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
cf3aeafc
Commit
cf3aeafc
authored
Mar 08, 2017
by
neil
Committed by
GitHub
Mar 08, 2017
Browse files
Merge pull request #709 from Neilpang/dev
fix nginx mode
parents
eb2a26cf
f08a79d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
cf3aeafc
...
...
@@ -2546,7 +2546,7 @@ _checkConf() {
if [ ! -f "$2" ] && ! echo "$2" | grep '*$' >/dev/null && echo "$2" | grep '*' >/dev/null; then
_debug "wildcard"
for _w_f in $2; do
if _checkConf "$1" "$_w_f"; then
if
[ -f "$_w_f"] &&
_checkConf "$1" "$_w_f"; then
return 0
fi
done
...
...
@@ -2559,9 +2559,9 @@ _checkConf() {
FOUND_REAL_NGINX_CONF="$2"
return 0
fi
if cat "$2" | tr
"\t" " " | grep "^ *include *.*;" >/dev/null; then
if cat "$2" | tr "\t" " " | grep "^ *include *.*;" >/dev/null; then
_debug "Try include files"
for included in $(grep "^ *include *.*;"
"$2"
| sed "s/include //" | tr -d " ;"); do
for included in $(
cat "$2" | tr "\t" " " |
grep "^ *include *.*;" | sed "s/include //" | tr -d " ;"); do
_debug "check included $included"
if _checkConf "$1" "$included"; then
return 0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment