autoupdater: Remove dependencies on luci-base
This commit is contained in:
parent
6c6fafa0ba
commit
fc35a19d2a
|
@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/package.mk
|
||||||
define Package/autoupdater
|
define Package/autoupdater
|
||||||
SECTION:=admin
|
SECTION:=admin
|
||||||
CATEGORY:=Administration
|
CATEGORY:=Administration
|
||||||
DEPENDS:=+lua-platform-info +luci-base +ecdsautils +!BUSYBOX_CONFIG_SHA512SUM:coreutils-sha512sum
|
DEPENDS:=+lua-platform-info +libuci-lua +luci-lib-nixio +ecdsautils +!BUSYBOX_CONFIG_SHA512SUM:coreutils-sha512sum
|
||||||
TITLE:=Automatically update firmware
|
TITLE:=Automatically update firmware
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,7 @@
|
||||||
local nixio = require('nixio')
|
local nixio = require('nixio')
|
||||||
local fs = require('nixio.fs')
|
local fs = require('nixio.fs')
|
||||||
local platform_info = require('platform_info')
|
local platform_info = require('platform_info')
|
||||||
local uci = require('luci.model.uci').cursor()
|
local uci = require('uci').cursor()
|
||||||
local util = require('luci.util')
|
|
||||||
|
|
||||||
local autoupdater_util = require('autoupdater.util')
|
local autoupdater_util = require('autoupdater.util')
|
||||||
local autoupdater_version = require('autoupdater.version')
|
local autoupdater_version = require('autoupdater.version')
|
||||||
|
@ -23,7 +22,9 @@ autoupdater_util.randomseed()
|
||||||
local settings = uci:get_all('autoupdater', 'settings')
|
local settings = uci:get_all('autoupdater', 'settings')
|
||||||
local branch_name = settings.branch
|
local branch_name = settings.branch
|
||||||
|
|
||||||
local old_version = util.trim(fs.readfile(settings.version_file) or '')
|
local version_file = io.open(settings.version_file)
|
||||||
|
local old_version = version_file and version_file:read('*l') or ''
|
||||||
|
version_file:close()
|
||||||
|
|
||||||
|
|
||||||
-- If force is true the updater will perform an upgrade regardless of
|
-- If force is true the updater will perform an upgrade regardless of
|
||||||
|
@ -265,7 +266,9 @@ local function autoupdate(mirror)
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
local checksum = util.exec(string.format("sha512sum '%s'", image)):match('^%x+')
|
local popen = io.popen(string.format("sha512sum '%s'", image))
|
||||||
|
local checksum = popen:read('*l'):match('^%x+')
|
||||||
|
popen:close()
|
||||||
if checksum ~= manifest.checksum then
|
if checksum ~= manifest.checksum then
|
||||||
io.stderr:write('Invalid image checksum!\n')
|
io.stderr:write('Invalid image checksum!\n')
|
||||||
os.remove(image)
|
os.remove(image)
|
||||||
|
|
Loading…
Reference in New Issue