[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Actually allow installation of master as just "latex" (228092e)

[Joseph Wright]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/228092e37cc95422a793a911f81e4c5dde15b611

>---------------------------------------------------------------

commit 228092e37cc95422a793a911f81e4c5dde15b611
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Apr 2 10:01:59 2019 +0100

    Actually allow installation of master as just "latex"


>---------------------------------------------------------------

228092e37cc95422a793a911f81e4c5dde15b611
 build-config.lua |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build-config.lua b/build-config.lua
index e97b0d5..dca08d2 100644
--- a/build-config.lua
+++ b/build-config.lua
@@ -27,9 +27,17 @@ if unpacksearch == nil then
   unpacksearch  = false
 end
 
--- Allow for 'next' release
+-- Allow for 'dev' release
 -- See stackoverflow.com/a/12142066/212001
-local branch = os.execute("git rev-parse --abbrev-ref HEAD") or ""
-if branch ~= "master" then
-  tdsroot = tdsroot or "latex-dev"
+local errorlevel = os.execute("git rev-parse --abbrev-ref HEAD > branch.tmp")
+if errorlevel ~= 0 then
+  exit(1)
+else
+  local f = assert(io.open("branch.tmp", "rb"))
+  local branch = f:read("*all")
+  f:close()
+  os.remove("branch.tmp")
+  if not string.match(branch, "%s*master%s*") then
+    tdsroot = tdsroot or "latex-dev"
+  end
 end