Merged

Göran Krampe
2 parents ba6047f5 7e507b62
Showing 1 changed file with 3 additions and 2 deletions
blimp.nim
@@ -267,14 +267,14 @@ proc deflate(filename: string) =
 # Iterator over all deflated files in the git clone
 iterator allDeflated() =
-  let filenames = cmd("git ls-files " & gitRootDir).split('\l')
+  let filenames = cmd("git ls-files " & gitRootDir).split({'\l', '\c'})
   for fn in filenames:
     if not blimpFilename(fn).isNil:
       yield fn
 # Iterator over all files matching the blimp filter in the git clone
 iterator allFiltered() =
-  let lines = cmd("git ls-files | git check-attr --stdin filter").split('\l')
+  let lines = cmd("git ls-files | git check-attr --stdin filter").split({'\l', '\c'})
   for line in lines:
     let status = line.split(':')
     if strip(status[2]) == "blimp":
@@ -454,6 +454,7 @@ homeDir = getHomeDir()
 homeDir = homeDir[0.. -2] # Not sure why it keeps a trailing "/" on Linux
 currentDir = getCurrentDir()
 gitRootDir = gitRoot()
+echo gitRootDir
 # Using lapp to get args, on parsing failure this will show usage automatically
 var args = parse(synopsis)