diff options
| author | Christian Schoenebeck <christian.schoenebeck@gmail.com> | 2016-01-31 20:25:16 +0100 |
|---|---|---|
| committer | Christian Schoenebeck <christian.schoenebeck@gmail.com> | 2016-01-31 20:25:16 +0100 |
| commit | 6982bbb3fef11c0817c5674db2082fe87ba11a92 (patch) | |
| tree | a27eb290767025cdc85582a04c5e386c443660a1 /applications/luci-app-ddns/luasrc/controller | |
| parent | 2e92c0718ad2f0b9bafa829b93f47a434c479cfd (diff) | |
| parent | 7f57a70110e8fefa9f744d10ebad2e499d0909bc (diff) | |
Merge pull request #634 from chris5560/master
luci-app-ddns: bump to version 2.4.0-1
Diffstat (limited to 'applications/luci-app-ddns/luasrc/controller')
| -rwxr-xr-x | applications/luci-app-ddns/luasrc/controller/ddns.lua | 12 |
1 files changed, 6 insertions, 6 deletions
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 <steven@midlink.org> -- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> -- Copyright 2013 Manuel Munz <freifunk at somakoma dot de> --- Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com> +-- Copyright 2014-2016 Christian Schoenebeck <christian dot schoenebeck at gmail dot com> -- 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 |