From 78927d65a2ba0256782dc92b1de92b1ed7c159d9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 26 Nov 2014 21:32:38 +0100 Subject: [PATCH] lua-platform-info: allow . character in image names Additionally, multiple . will be collapsed to one, and combinations of - and . with at least one - will be replaced by a single - --- libs/lua-platform-info/files/ar71xx/generic/platform_info.lua | 2 +- libs/lua-platform-info/files/mpc85xx/generic/platform_info.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/lua-platform-info/files/ar71xx/generic/platform_info.lua b/libs/lua-platform-info/files/ar71xx/generic/platform_info.lua index 71ee32a..0ccefdf 100644 --- a/libs/lua-platform-info/files/ar71xx/generic/platform_info.lua +++ b/libs/lua-platform-info/files/ar71xx/generic/platform_info.lua @@ -33,5 +33,5 @@ end -- The image name for sysupgrades function get_image_name() - return (model:lower():gsub('[^%w]+', '-'):gsub('%-+$', '')) + return (model:lower():gsub('[^%w%.]+', '-'):gsub('%.+', '.'):gsub('[%-%.]*%-[%-%.]*', '-'):gsub('%-+$', '')) end diff --git a/libs/lua-platform-info/files/mpc85xx/generic/platform_info.lua b/libs/lua-platform-info/files/mpc85xx/generic/platform_info.lua index 970c852..931e347 100644 --- a/libs/lua-platform-info/files/mpc85xx/generic/platform_info.lua +++ b/libs/lua-platform-info/files/mpc85xx/generic/platform_info.lua @@ -33,5 +33,5 @@ end -- The image name for sysupgrades function get_image_name() - return (model:lower():gsub('[^%w]+', '-'):gsub('%-+$', '')) + return (model:lower():gsub('[^%w%.]+', '-'):gsub('%.+', '.'):gsub('[%-%.]*%-[%-%.]*', '-'):gsub('%-+$', '')) end