summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChuanhong Guo <gch981213@gmail.com>2016-05-14 11:46:28 +0800
committerChuanhong Guo <gch981213@gmail.com>2016-05-14 11:46:28 +0800
commitc1f0a9971a0b75515996cd59dfaf70f3ff6cc624 (patch)
treec85fc6ea7d3fe7c98593e86a625bd7d3550cce86
parentb213573682460dd395878c7369aba173f00bbb99 (diff)
luci-base:Turn off pattern matching when generating distversion
Otherwize the distrevision may be displayed twice if it contains some special matching patterns.(For example I am using "git-$hash" in my own OpenWrt branch.) Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
-rwxr-xr-xmodules/luci-base/src/mkversion.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/luci-base/src/mkversion.sh b/modules/luci-base/src/mkversion.sh
index e3ef97448..e2d02c1c7 100755
--- a/modules/luci-base/src/mkversion.sh
+++ b/modules/luci-base/src/mkversion.sh
@@ -10,7 +10,7 @@ if pcall(dofile, "/etc/openwrt_release") and _G.DISTRIB_DESCRIPTION then
distversion = _G.DISTRIB_DESCRIPTION
if _G.DISTRIB_REVISION then
distrevision = _G.DISTRIB_REVISION
- if not distversion:find(distrevision) then
+ if not distversion:find(distrevision,1,true) then
distversion = distversion .. " " .. distrevision
end
end