Merge pull request #669 from hnyman/git-branch

LuCI: Display the proper LuCI git branch in GUI

1 files changed, 1 insertions, 24 deletions

diff --git a/modules/luci-base/src/mkversion.sh b/modules/luci-base/src/mkversion.sh
index 55b0ebd22..33c7a3ffe 100755
--- 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
 
@@ -36,6 +13,6 @@ else
 	distversion = "Development Snapshot"
 end
 
-luciname    = "$variant"
+luciname    = "${3:-LuCI}"
 luciversion = "${2:-Git}"
 EOF