Commit f9e9a47e58eeba71dbcb08746b794c194e9baff4
Merged
Showing
1 changed file
with
3 additions
and
2 deletions
blimp.nim
... | ... | @@ -267,14 +267,14 @@ proc deflate(filename: string) = |
267 | 267 | |
268 | 268 | # Iterator over all deflated files in the git clone |
269 | 269 | iterator allDeflated() = |
270 | - let filenames = cmd("git ls-files " & gitRootDir).split('\l') | |
270 | + let filenames = cmd("git ls-files " & gitRootDir).split({'\l', '\c'}) | |
271 | 271 | for fn in filenames: |
272 | 272 | if not blimpFilename(fn).isNil: |
273 | 273 | yield fn |
274 | 274 | |
275 | 275 | # Iterator over all files matching the blimp filter in the git clone |
276 | 276 | iterator allFiltered() = |
277 | - let lines = cmd("git ls-files | git check-attr --stdin filter").split('\l') | |
277 | + let lines = cmd("git ls-files | git check-attr --stdin filter").split({'\l', '\c'}) | |
278 | 278 | for line in lines: |
279 | 279 | let status = line.split(':') |
280 | 280 | if strip(status[2]) == "blimp": |
... | ... | @@ -454,6 +454,7 @@ homeDir = getHomeDir() |
454 | 454 | homeDir = homeDir[0.. -2] # Not sure why it keeps a trailing "/" on Linux |
455 | 455 | currentDir = getCurrentDir() |
456 | 456 | gitRootDir = gitRoot() |
457 | +echo gitRootDir | |
457 | 458 | |
458 | 459 | # Using lapp to get args, on parsing failure this will show usage automatically |
459 | 460 | var args = parse(synopsis) | ... | ... |