From fc35a19d2a054a9fb0a8b25c5924966cfb32d946 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 31 Aug 2015 18:24:29 +0200 Subject: [PATCH] autoupdater: Remove dependencies on luci-base --- admin/autoupdater/Makefile | 2 +- admin/autoupdater/files/usr/sbin/autoupdater | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/admin/autoupdater/Makefile b/admin/autoupdater/Makefile index edccee4..5f13db4 100644 --- a/admin/autoupdater/Makefile +++ b/admin/autoupdater/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/package.mk define Package/autoupdater SECTION:=admin 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 endef diff --git a/admin/autoupdater/files/usr/sbin/autoupdater b/admin/autoupdater/files/usr/sbin/autoupdater index 32cf27d..79c96d4 100755 --- a/admin/autoupdater/files/usr/sbin/autoupdater +++ b/admin/autoupdater/files/usr/sbin/autoupdater @@ -4,8 +4,7 @@ local nixio = require('nixio') local fs = require('nixio.fs') local platform_info = require('platform_info') -local uci = require('luci.model.uci').cursor() -local util = require('luci.util') +local uci = require('uci').cursor() local autoupdater_util = require('autoupdater.util') local autoupdater_version = require('autoupdater.version') @@ -23,7 +22,9 @@ autoupdater_util.randomseed() local settings = uci:get_all('autoupdater', 'settings') 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 @@ -265,7 +266,9 @@ local function autoupdate(mirror) return false 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 io.stderr:write('Invalid image checksum!\n') os.remove(image)