luci-proto-openconnect: remove "interface" field

[project/luci.git] / modules / luci-base / src / mkversion.sh

diff --git a/modules/luci-base/src/mkversion.sh b/modules/luci-base/src/mkversion.sh
index 55b0ebd..e2d02c1 100755 (executable)
--- a/modules/luci-base/src/mkversion.sh
+++ b/modules/luci-base/src/mkversion.sh
@@ -1,28 +1,5 @@
 #!/bin/sh
 
-if svn info >/dev/null 2>/dev/null; then
-       if [ "${4%%/*}" = "branches" ]; then
-               variant="LuCI ${4##*[-/]} Branch"
-       elif [ "${4%%/*}" = "tags" ]; then
-               variant="LuCI ${4##*[-/]} Release"
-       else
-               variant="LuCI Trunk"
-       fi
-elif git status >/dev/null 2>/dev/null; then
-       tag="$(git describe --tags 2>/dev/null)"
-       branch="$(git symbolic-ref --short -q HEAD 2>/dev/null)"
-
-       if [ -n "$tag" ]; then
-               variant="LuCI $tag Release"
-       elif [ "$branch" != "master" ]; then
-               variant="LuCI ${branch##*-} Branch"
-       else
-               variant="LuCI Master"
-       fi
-else
-       variant="LuCI"
-fi
-
 cat <<EOF > $1
 local pcall, dofile, _G = pcall, dofile, _G
 
@@ -31,11 +8,17 @@ module "luci.version"
 if pcall(dofile, "/etc/openwrt_release") and _G.DISTRIB_DESCRIPTION then
        distname    = ""
        distversion = _G.DISTRIB_DESCRIPTION
+       if _G.DISTRIB_REVISION then
+               distrevision = _G.DISTRIB_REVISION
+               if not distversion:find(distrevision,1,true) then
+                       distversion = distversion .. " " .. distrevision
+               end
+       end
 else
        distname    = "OpenWrt"
        distversion = "Development Snapshot"
 end
 
-luciname    = "$variant"
+luciname    = "${3:-LuCI}"
 luciversion = "${2:-Git}"
 EOF