From: Tobias Ulmer Date: Mon, 8 Sep 2014 15:50:01 +0000 (+0200) Subject: e2lib.join: fix indentation X-Git-Tag: e2factory-2.3.15rc1~189 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=89fbf7091267e973a85b07a851f76b646647b6bb;p=e2factory.git e2lib.join: fix indentation Signed-off-by: Tobias Ulmer --- diff --git a/generic/e2lib.lua b/generic/e2lib.lua index 7cf65c2..b01956c 100644 --- a/generic/e2lib.lua +++ b/generic/e2lib.lua @@ -750,42 +750,42 @@ end -- @param ... Further path components, following the same rule as "p2". -- @return A joined path (string), which may be empty. function e2lib.join(p1, p2, ...) - assert(type(p1) == "string") - assert(p2 == nil or type(p2) == "string") - - local sep = "/" - local args = {p1, p2, ...} - local buildpath = "" - local sepnext = false - local component - - for i=1,#args do - component = args[i] - assert(type(component) == "string") - - if sepnext then - -- If the previous or next component already - -- has a separator in the right place, we don't - -- need to add one. We do however not go to the - -- trouble removing multiple separators. - if buildpath:sub(-1) == sep or - component:sub(1) == sep then - -- do nothing - else - buildpath = buildpath .. sep - end - end - - buildpath = buildpath .. component - - if component:len() > 0 then - sepnext = true - else - sepnext = false - end - end - - return buildpath + assert(type(p1) == "string") + assert(p2 == nil or type(p2) == "string") + + local sep = "/" + local args = {p1, p2, ...} + local buildpath = "" + local sepnext = false + local component + + for i=1,#args do + component = args[i] + assert(type(component) == "string") + + if sepnext then + -- If the previous or next component already + -- has a separator in the right place, we don't + -- need to add one. We do however not go to the + -- trouble removing multiple separators. + if buildpath:sub(-1) == sep or + component:sub(1) == sep then + -- do nothing + else + buildpath = buildpath .. sep + end + end + + buildpath = buildpath .. component + + if component:len() > 0 then + sepnext = true + else + sepnext = false + end + end + + return buildpath end --- Checks whether file matches some usual backup file names left behind by vi