Browse Source

Merge pull request #14510 from zhanhb/ddns-scripts

ddns-scripts: fix wget-ssl path
lilik-openwrt-22.03
Florian Eckert 3 years ago
committed by GitHub
parent
commit
f21885ec85
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
  1. +1
    -1
      net/ddns-scripts/Makefile
  2. +4
    -3
      net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh

+ 1
- 1
net/ddns-scripts/Makefile View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-scripts
PKG_VERSION:=2.8.2
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_LICENSE:=GPL-2.0


+ 4
- 3
net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh View File

@ -85,7 +85,8 @@ NSLOOKUP=$(command -v nslookup)
# Transfer Programs
WGET=$(command -v wget)
WGET_SSL=$(command -v wget-ssl)
# SSL support is available if WGET_SSL is not empty
WGET_SSL=$("$WGET" -V 2>/dev/null | grep -F +https)
CURL=$(command -v curl)
# CURL_SSL not empty then SSL support available
@ -711,8 +712,8 @@ do_transfer() {
[ -z "$bind_network" ] && [ "$ip_source" = "network" ] && [ "$ip_network" ] && bind_network="$ip_network"
# lets prefer GNU Wget because it does all for us - IPv4/IPv6/HTTPS/PROXY/force IP version
if [ -n "$WGET_SSL" -a $USE_CURL -eq 0 ]; then # except global option use_curl is set to "1"
__PROG="$WGET_SSL --hsts-file=/tmp/.wget-hsts -nv -t 1 -O $DATFILE -o $ERRFILE" # non_verbose no_retry outfile errfile
if [ -n "$WGET_SSL" ] && [ $USE_CURL -eq 0 ]; then # except global option use_curl is set to "1"
__PROG="$WGET --hsts-file=/tmp/.wget-hsts -nv -t 1 -O $DATFILE -o $ERRFILE" # non_verbose no_retry outfile errfile
# force network/ip to use for communication
if [ -n "$bind_network" ]; then
local __BINDIP


Loading…
Cancel
Save