aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nimterop/build.nim13
1 files changed, 10 insertions, 3 deletions
diff --git a/nimterop/build.nim b/nimterop/build.nim
index 2f8765e..843db42 100644
--- a/nimterop/build.nim
+++ b/nimterop/build.nim
@@ -278,9 +278,16 @@ proc findFile*(file: string, dir: string, recurse = true, first = false, regex =
when not defined(windows):
recursive = "-maxdepth 1"
- let
- dir = if not regex: dir / file.parentDir() else: dir
- file = if not regex: file.extractFilename else: file
+ var
+ dir = dir
+ file = file
+ if not recurse:
+ let
+ pdir = file.parentDir()
+ if pdir.len != 0:
+ dir = dir / pdir
+
+ file = file.extractFilename
cmd = cmd % [recursive, (".*[\\\\/]" & file & "$").quoteShell, dir.sanitizePath]