]> git.e2factory.org Git - e2factory.git/commitdiff
e2-install-e2: make destdir an absolute path
authorTobias Ulmer <tu@emlix.com>
Thu, 31 Oct 2013 20:38:02 +0000 (21:38 +0100)
committerTobias Ulmer <tu@emlix.com>
Wed, 16 Nov 2016 14:01:23 +0000 (15:01 +0100)
Signed-off-by: Tobias Ulmer <tu@emlix.com>
global/e2-install-e2.lua

index 8adcf27c3d7041559ded894da22541d4eb59c64d..1fe3fbd2cd40eecd97c1fb5b99425bb96226b3b5 100644 (file)
@@ -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)