projects
/
oweals
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commit from LuCI Translation Portal by user jow.: 8 of 8 messages translated (0 fuzzy).
[oweals/luci.git]
/
build
/
mkversion.sh
diff --git
a/build/mkversion.sh
b/build/mkversion.sh
index 2361e5f3b9ab19086e8f2b3e855aa2fcf5528ccc..afb34b41511f92f0766c050e9ca71108ec66aacd 100755
(executable)
--- a/
build/mkversion.sh
+++ b/
build/mkversion.sh
@@
-1,7
+1,4
@@
#!/bin/sh
#!/bin/sh
-
-local variant
-
if [ "${4%%/*}" = "branches" ]; then
variant="LuCI ${4##*[-/]} Branch"
elif [ "${4%%/*}" = "tags" ]; then
if [ "${4%%/*}" = "branches" ]; then
variant="LuCI ${4##*[-/]} Branch"
elif [ "${4%%/*}" = "tags" ]; then
@@
-11,10
+8,17
@@
else
fi
cat <<EOF > $1
fi
cat <<EOF > $1
+local pcall, dofile, _G = pcall, dofile, _G
+
module "luci.version"
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}"
luciname = "$variant"
luciversion = "${5:-svn}"