diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-03 19:31:40 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-03 19:31:40 +0000 |
| commit | 119b6d898f0bca9874fa91268d4984be84e92dfc (patch) | |
| tree | 1d1b2a4d5ca372d3410d9c9de4c4f6f89a70e39a | |
| parent | 82ca74d1b3bbc23224aced1005579cad1441ff62 (diff) | |
luci-0.9: merge r6016
| -rwxr-xr-x | build/mkversion.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/build/mkversion.sh b/build/mkversion.sh index 2361e5f3b9..ce6eb83667 100755 --- a/build/mkversion.sh +++ b/build/mkversion.sh @@ -11,10 +11,17 @@ else fi cat <<EOF > $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}" |