X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=luci.mk;h=137886f1b322c75655a0276c03cfd63ed86b1aa7;hp=2235cc5f0582e526ade5c2706f91201b8e3f131f;hb=99af05d103f3f3e41e6b6b7291e6b3f2277ba6e2;hpb=c5287ef15fcc92e8c4a5f0b13051c6fd52aead07 diff --git a/luci.mk b/luci.mk index 2235cc5f0..137886f1b 100644 --- a/luci.mk +++ b/luci.mk @@ -23,6 +23,7 @@ LUCI_LANG.he=עִבְרִית (Hebrew) LUCI_LANG.hu=Magyar (Hungarian) LUCI_LANG.it=Italiano (Italian) LUCI_LANG.ja=日本語 (Japanese) +LUCI_LANG.ko=한국어 (Korean) LUCI_LANG.ms=Bahasa Melayu (Malay) LUCI_LANG.no=Norsk (Norwegian) LUCI_LANG.pl=Polski (Polish) @@ -69,7 +70,8 @@ PKG_VERSION?=$(if $(DUMP),x,$(strip $(shell \ PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \ variant="LuCI"; \ if git log -1 >/dev/null 2>/dev/null; then \ - branch="$$(git symbolic-ref --short -q HEAD 2>/dev/null)"; \ + branch="$$(git branch --remote --verbose --no-abbrev --contains 2>/dev/null | \ + sed -rne 's|^[^/]+/([^ ]+) [a-f0-9]{40} .+$$|\1|p' | head -n1)"; \ if [ "$$branch" != "master" ]; then \ variant="LuCI $$branch branch"; \ else \