From bee8c99eaaa4d38a0224fb9c9b96647e9e5f1b49 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Wed, 9 Nov 2016 18:41:10 +0100 Subject: [PATCH] e2-install-e2: cleanup ref variable Signed-off-by: Tobias Ulmer --- global/e2-install-e2.lua | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua index 66ea97c..7073109 100644 --- a/global/e2-install-e2.lua +++ b/global/e2-install-e2.lua @@ -143,13 +143,10 @@ local function e2_install_e2(arg) end for _,ex in ipairs(extensions) do - local ref - if ex.ref:match("/") then - ref = ex.ref - else - ref = string.format("refs/tags/%s", ex.ref) + if not ex.ref:match("/") then + ex.ref = string.format("refs/tags/%s", ex.ref) end - e2lib.logf(2, "fetching extension: %s (%s)", ex.name, ref) + e2lib.logf(2, "fetching extension: %s (%s)", ex.name, ex.ref) local server = config.site.e2_server local location = string.format("%s/%s.git", config.site.e2_base, ex.name) local destdir = e2lib.join(root, ".e2/e2/extensions", ex.name) @@ -167,7 +164,7 @@ local function e2_install_e2(arg) error(e:cat(re)) end - rc, re = generic_git.git_checkout1(destdir, ref) + rc, re = generic_git.git_checkout1(destdir, ex.ref) if not rc then error(e:cat(re)) end -- 2.39.5