summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Tortonesi <[email protected]>2022-11-04 14:27:23 +0100
committerMauro Tortonesi <[email protected]>2022-11-04 14:27:23 +0100
commite97189c91af7eb44883894d6b8cff04a28ec9700 (patch)
treed23f1c32f7cbaae900b976d2d73d8f569fd3da7e
parent4be10d436233bd7dffc0c91f5c5bd2d0806156ba (diff)
Refactored code to use string:lastof.
-rw-r--r--xmake/core/sandbox/modules/import/lib/detect/find_path.lua13
1 files changed, 1 insertions, 12 deletions
diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_path.lua b/xmake/core/sandbox/modules/import/lib/detect/find_path.lua
index 98edd8aa4..a88562a76 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_path.lua
+++ b/xmake/core/sandbox/modules/import/lib/detect/find_path.lua
@@ -37,18 +37,7 @@ function sandbox_lib_detect_find_path._find(filedir, name)
local filepath = results[1]
if filepath then
-- we need translate name first, https://github.com/xmake-io/xmake-repo/issues/1315
- local to_search = path.pattern(path.translate(name))
-
- -- need to find the last occurrence of substring to_search within filepath
- local last_index = 0
- local idx = 0
- while true do
- idx = filepath:find(to_search, idx+1)
- if idx == nil then break end
- last_index = idx
- end
-
- local p = filepath:find(to_search, last_index)
+ local p = filepath:lastof(path.pattern(path.translate(name)))
if p then
filepath = path.translate(filepath:sub(1, p - 1))
if os.isdir(filepath) then