From: Tobias Ulmer Date: Thu, 31 Oct 2013 20:38:02 +0000 (+0100) Subject: e2-install-e2: make destdir an absolute path X-Git-Tag: e2factory-2.3.15rc1~422 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=348bc84201328ffd780743835a42fb301f06d08b;p=e2factory.git e2-install-e2: make destdir an absolute path Signed-off-by: Tobias Ulmer --- diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua index 8adcf27..1fe3fbd 100644 --- a/global/e2-install-e2.lua +++ b/global/e2-install-e2.lua @@ -160,10 +160,10 @@ local function e2_install_e2(arg) -- checkout e2factory itself local server = config.site.e2_server local location = config.site.e2_location - local destdir = "e2" + local destdir = e2lib.join(root, ".e2/e2") e2lib.logf(2, "fetching e2factory (ref %s)", ref) rc, re = generic_git.git_clone_from_server(scache, server, location, - destdir, false) + destdir, false) if not rc then return false, e:cat(re) end @@ -191,7 +191,7 @@ local function e2_install_e2(arg) e2lib.logf(2, "fetching extension: %s (%s)", ex.name, ref) local server = config.site.e2_server local location = string.format("%s/%s.git", config.site.e2_base, ex.name) - local destdir = ex.name + local destdir = e2lib.join(root, ".e2/e2/extensions", ex.name) if e2lib.exists(destdir) then rc, re = e2lib.unlink_recursive(destdir)