From c96b2ece708460aefe8e8f7671ce54be509796e2 Mon Sep 17 00:00:00 2001 From: Nathan DECHER Date: Tue, 15 Sep 2020 11:36:17 +0200 Subject: [PATCH] fixed wildcard and normalizepath --- moonbuild/fsutil.moon | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/moonbuild/fsutil.moon b/moonbuild/fsutil.moon index e546157..7d6f639 100644 --- a/moonbuild/fsutil.moon +++ b/moonbuild/fsutil.moon @@ -16,7 +16,10 @@ normalizepath = (file) -> remove parts, i-1 i -= 2 continue - (absolute and '/' or '') .. concat parts, '/' + if #parts==0 + '.' + else + (absolute and '/' or '') .. concat parts, '/' ls = (d) -> [f for f in *dir normalizepath d when f!='.' and f!='..'] @@ -54,7 +57,7 @@ wildcard = (glob) -> for i, part in ipairs parts prevpath = (absolute and '/' or '') .. concat parts, '/', 1, i-1 - currpath = prevpath .. '/' .. part + currpath = (i==1 and '' or (prevpath .. '/')) .. part if match part, '%*%*.*%*%*' error "Two '**' in the same path component in a wildcard"