From 119b6d898f0bca9874fa91268d4984be84e92dfc Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 3 Apr 2010 19:31:40 +0000 Subject: [PATCH] luci-0.9: merge r6016 --- build/mkversion.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/build/mkversion.sh b/build/mkversion.sh index 2361e5f3b..ce6eb8366 100755 --- a/build/mkversion.sh +++ b/build/mkversion.sh @@ -11,10 +11,17 @@ else fi cat < $1 +local pcall, dofile, _G = pcall, dofile, _G + module "luci.version" -distname = "${2:-OpenWrt}" -distversion = "${3:-Development Snapshot}" +if pcall(dofile, "/etc/openwrt_release") and _G.DISTRIB_DESCRIPTION then + distname = "" + distversion = _G.DISTRIB_DESCRIPTION +else + distname = "${2:-OpenWrt}" + distversion = "${3:-Development Snapshot}" +end luciname = "$variant" luciversion = "${5:-svn}" -- 2.25.1