ddns-scripts currently fails if GNU Wget is installed. Ensure that ddns-scripts depends on, and prefers BusyBox Wget to GNU Wget.
While at it, fix small typo too: s/ERRROR/ERROR/ Signed-off-by: Jonathan McCrohan <[email protected]> --- net/ddns-scripts/Makefile | 7 ++++++- net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh | 4 ++-- net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 651c623..1e5c4dd 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:=1.0.0 -PKG_RELEASE:=21 +PKG_RELEASE:=22 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) @@ -16,6 +16,11 @@ define Package/ddns-scripts PKGARCH:=all endef +define Package/ddns-scripts/config + select BUSYBOX_CONFIG_WGET + select BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION +endef + define Package/ddns-scripts/description A highly configurable set of scripts for doing dynamic dns updates 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 3d435d3..8f0d77a 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 @@ -85,14 +85,14 @@ get_current_ip() do if [ -z "$current_ip" ] then - current_ip=$(echo $( wget -O - $addr 2>/dev/null) | grep -o "$ip_regex") + current_ip=$(echo $( /bin/busybox wget -O - $addr 2>/dev/null) | grep -o "$ip_regex") fi done #here we hard-code the dyndns checkip url in case no url was specified if [ -z "$current_ip" ] then - current_ip=$(echo $( wget -O - http://checkip.dyndns.org 2>/dev/null) | grep -o "$ip_regex") + current_ip=$(echo $( /bin/busybox wget -O - http://checkip.dyndns.org 2>/dev/null) | grep -o "$ip_regex") fi fi diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh index 580bed8..a3ca93d 100755 --- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh @@ -14,7 +14,7 @@ service_id=$1 if [ -z "$service_id" ] then - echo "ERRROR: You must specify a service id (the section name in the /etc/config/ddns file) to initialize dynamic DNS." + echo "ERROR: You must specify a service id (the section name in the /etc/config/ddns file) to initialize dynamic DNS." return 1 fi @@ -109,7 +109,7 @@ then retrieve_prog="${retrieve_prog}--capath $cacert " fi else - retrieve_prog="/usr/bin/wget -O - "; + retrieve_prog="/bin/busybox wget -O - "; fi service_file="/usr/lib/ddns/services" -- 1.7.10.4 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
