fixed wildcard and normalizepath

alfons-task
Nathan DECHER 4 years ago
parent 0e23ccecfb
commit c96b2ece70
  1. 5
      moonbuild/fsutil.moon

@ -16,6 +16,9 @@ normalizepath = (file) ->
remove parts, i-1 remove parts, i-1
i -= 2 i -= 2
continue continue
if #parts==0
'.'
else
(absolute and '/' or '') .. concat parts, '/' (absolute and '/' or '') .. concat parts, '/'
ls = (d) -> ls = (d) ->
@ -54,7 +57,7 @@ wildcard = (glob) ->
for i, part in ipairs parts for i, part in ipairs parts
prevpath = (absolute and '/' or '') .. concat parts, '/', 1, i-1 prevpath = (absolute and '/' or '') .. concat parts, '/', 1, i-1
currpath = prevpath .. '/' .. part currpath = (i==1 and '' or (prevpath .. '/')) .. part
if match part, '%*%*.*%*%*' if match part, '%*%*.*%*%*'
error "Two '**' in the same path component in a wildcard" error "Two '**' in the same path component in a wildcard"

Loading…
Cancel
Save