From 7f57a70110e8fefa9f744d10ebad2e499d0909bc Mon Sep 17 00:00:00 2001 From: Christian Schöenebeck Date: Sat, 30 Jan 2016 19:32:55 +0100 Subject: luci-app-ddns: bump to version 2.4.0-1 - fixes for #611 and #620 - adaptions for ddns-scripts 2.6.0 -- add hint for problems with BusyBox nslookup compiled with musl and offer installing hostip package -- add hint for not installed certificates inside /etc/ssl/certs and offer installing ca-certificates package https://github.com/openwrt/packages/pull/2243 -- check if malfunctional BusyBox nslookup installed, so disable using option dns_server if not Bind host or hostip installed - optimizations - cleanup: remove .po files without any translations Signed-off-by: Christian Schoenebeck --- applications/luci-app-ddns/luasrc/controller/ddns.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'applications/luci-app-ddns/luasrc/controller') diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua index abaf1c76a3..e141d07b6f 100755 --- a/applications/luci-app-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua @@ -1,7 +1,7 @@ -- Copyright 2008 Steven Barth -- Copyright 2008 Jo-Philipp Wich -- Copyright 2013 Manuel Munz --- Copyright 2014 Christian Schoenebeck +-- Copyright 2014-2016 Christian Schoenebeck -- Licensed to the public under the Apache License 2.0. module("luci.controller.ddns", package.seeall) @@ -18,11 +18,11 @@ local UTIL = require "luci.util" local DDNS = require "luci.tools.ddns" -- ddns multiused functions local srv_name = "ddns-scripts" -local srv_ver_min = "2.5.0" -- minimum version of service required +local srv_ver_min = "2.6.0" -- minimum version of service required local srv_ver_cmd = [[/usr/lib/ddns/dynamic_dns_updater.sh --version | awk {'print $2'}]] local app_name = "luci-app-ddns" local app_title = "Dynamic DNS" -local app_version = "2.3.1-1" +local app_version = "2.4.0-1" function index() local nxfs = require "nixio.fs" -- global definitions not available @@ -96,11 +96,11 @@ function app_title_main() end function service_version() local ver = nil - IPKG.list_installed(srv_name, function(n, ver, d) - -- nothing to do + IPKG.list_installed(srv_name, function(n, v, d) + if v and (#v > 0) then ver = v end end ) - if not ver then + if not ver or (#ver == 0) then ver = UTIL.exec(srv_ver_cmd) if #ver == 0 then ver = nil end end -- cgit v1.2.3