Skip to content
This repository was archived by the owner on Aug 22, 2021. It is now read-only.

Commit 462addc

Browse files
committed
fix jq parse
1 parent 664d561 commit 462addc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/xwall.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ build_web() {
137137

138138
checkIP() {
139139
local realIP4="$(curl -sL ${ip4_api} -m 5)"
140-
local resolvedIP4="$(curl -sSL https://cloudflare-dns.com/dns-query\?name\=$1\&type\=A -H 'accept: application/dns-json' | jq ".Answer | .[] | select(.type == 1)" | jq ".data" --raw-output)"
140+
local resolvedIP4="$(curl -sSL https://cloudflare-dns.com/dns-query\?name\=$1\&type\=A -H 'accept: application/dns-json' | jq ".Answer | .[] | select(.type == 1) | .data" --raw-output)"
141141

142142
[ ! -z "${realIP4}" ] && printf "%s %s\n" "detected IPv4 address:" "${realIP4}" | writeLog >> $log_path
143143
([ ! -z "${resolvedIP4}" ] && [ "${resolvedIP4}" != "null" ]) && printf "%s %s\n" "found A record:" "${resolvedIP4}" | writeLog >> $log_path
@@ -147,7 +147,7 @@ checkIP() {
147147
return 0
148148
else
149149
local realIP6="$(curl -sL ${ip6_api} -m 5)"
150-
local resolvedIP6="$(curl -sSL https://cloudflare-dns.com/dns-query\?name\=$1\&type\=AAAA -H 'accept: application/dns-json' | jq ".Answer | .[] | select(.type == 28)" | jq ".data" --raw-output)"
150+
local resolvedIP6="$(curl -sSL https://cloudflare-dns.com/dns-query\?name\=$1\&type\=AAAA -H 'accept: application/dns-json' | jq ".Answer | .[] | select(.type == 28) | .data" --raw-output)"
151151
[ ! -z "${realIP6}" ] && printf "%s %s\n" "detected IPv6 address:" "${realIP6}" | writeLog >> $log_path
152152
([ ! -z "${resolvedIP6}" ] && [ "${resolvedIP6}" != "null" ]) && printf "%s %s\n" "found AAAA record:" "${resolvedIP6}" | writeLog >> $log_path
153153
if [[ "${realIP6}" == "${resolvedIP6}" ]]; then

0 commit comments

Comments
 (0)