From 230eebdf1c68919b1f14ecc29501ae4a29a09317 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 17 Feb 2015 20:37:56 +0100 Subject: [PATCH] lua-platform-info: allow + in image names Otherwise the UAP Outdoor+ can't be distinguished from the old UAP Outdoor. --- 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 0ccefdf..750d563 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('%.+', '.'):gsub('[%-%.]*%-[%-%.]*', '-'):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 931e347..3e63c80 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('%.+', '.'):gsub('[%-%.]*%-[%-%.]*', '-'):gsub('%-+$', '')) + return (model:lower():gsub('[^%w%.%+]+', '-'):gsub('%.+', '.'):gsub('[%-%.]*%-[%-%.]*', '-'):gsub('%-+$', '')) end