From bd2a9ab20b470e808cd8f5156c3a2d872f752ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 21 Mar 2019 09:38:48 +0100 Subject: personal-pkgs-repo: Update for new updater and changed lists --- personal-pkgs-repo/Makefile | 2 +- personal-pkgs-repo/files/updater.lua | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'personal-pkgs-repo') diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index a0fb33d..6ec7341 100644 --- a/personal-pkgs-repo/Makefile +++ b/personal-pkgs-repo/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=personal-pkgs-repo -PKG_VERSION:=1.4.4 +PKG_VERSION:=1.4.5 PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/personal-pkgs-repo/files/updater.lua b/personal-pkgs-repo/files/updater.lua index 5f85763..79c6847 100644 --- a/personal-pkgs-repo/files/updater.lua +++ b/personal-pkgs-repo/files/updater.lua @@ -1,14 +1,13 @@ local uci_cursor = uci.cursor(root_dir .. "/etc/config") local board -if model:match('Mox') then +local model = model or os_release["LEDE_DEVICE_PRODUCT"] +if model:match('[Mm]ox') then board = "mox" -elseif model:match('Omnia') then +elseif model:match('[Oo]mnia') then board = "omnia" -elseif model:match('^Turris$') then - board = "turris" else - DIE("Unsupported board!") + DIE("Unsupported board: " .. model) end local mode = uci_cursor:get("updater", "turris", "mode") @@ -17,7 +16,7 @@ if mode and mode ~= "branch" then DIE("Only branch mode allowed for personal-pkgs, used: " .. tostring(mode)) end if animal ~= "hbd" and animal ~= "hbk" then - DIE("Unsupported branch for pernal-pkgs: " .. tostring(animal)) + DIE("Unsupported branch for personal-pkgs: " .. tostring(animal)) end Repository("personal-pkgs", "https://cynerd.cz/repo/turris/" .. animal .. "/" .. board, { -- cgit v1.2.3