diff options
| author | sbyx <steven@midlink.org> | 2014-09-22 16:46:53 +0200 |
|---|---|---|
| committer | sbyx <steven@midlink.org> | 2014-09-22 16:46:53 +0200 |
| commit | 742cea53d9c90edc8d253aee9d93d3b9b8b0095d (patch) | |
| tree | eff229dfd05a8efd57556ca806ceed81ef1997a0 | |
| parent | 07d3672d46a5d6c699f1e968b25accac20846e13 (diff) | |
| parent | 6522ff5e31057857ef445da785f7fedfefd01093 (diff) | |
Merge pull request #348 from chris5560/master
ddns-scripts: fix issue (#337) current/registered ip never match
| -rw-r--r-- | net/ddns-scripts/Makefile | 2 | ||||
| -rw-r--r-- | net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 7fcb2cc80..6e69cac44 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=2.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh index 057fe9258..e643c7559 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh @@ -672,7 +672,7 @@ get_registered_ip() { } || { # we need to run twice because multi-line output needs to be directly piped to grep because # pipe returns return code of last prog in pipe but we need errors from host command - __IP=$(eval $__RUNPROG | grep "^$domain" | grep -m 1 -o "$__REGEX") + __IP=$(eval $__RUNPROG | awk -F "address " '/has/ {print $2; exit}' ) } elif [ -x /usr/bin/nslookup ]; then # last use BusyBox nslookup @@ -692,7 +692,7 @@ get_registered_ip() { } || { # we need to run twice because multi-line output needs to be directly piped to grep because # pipe returns return code of last prog in pipe but we need errors from nslookup command - __IP=$(eval $__RUNPROG | sed '1,2d' | grep -o "Name:\|Address.*" | grep -m 1 -o "$__REGEX") + __IP=$(eval $__RUNPROG | sed -ne "3,\$ { s/^Address [0-9]*: \($__REGEX\).*$/\\1/p }" ) } else # there must be an error |