Skip to content

Commit 9d6ff85

Browse files
authored
Merge pull request #458 from wpferguson/revert_ensure_lib_in_path
revert ensure_lib_in_path
2 parents 65c22e4 + 125af63 commit 9d6ff85

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

tools/script_manager.lua

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -509,25 +509,6 @@ local function process_script_data(script_file)
509509
restore_log_level(old_log_level)
510510
end
511511

512-
local function ensure_lib_in_search_path(line)
513-
local old_log_level = set_log_level(sm.log_level)
514-
set_log_level(log.debug)
515-
log.msg(log.debug, "line is " .. line)
516-
if string.match(line, ds.sanitize_lua(dt.configuration.config_dir .. PS .. "lua/lib")) then
517-
log.msg(log.debug, line .. " is already in search path, returning...")
518-
return
519-
end
520-
local path = string.match(line, "(.+)/lib/.+lua")
521-
log.msg(log.debug, "extracted path is " .. path)
522-
log.msg(log.debug, "package.path is " .. package.path)
523-
if not string.match(package.path, ds.sanitize_lua(path)) then
524-
log.msg(log.debug, "path isn't in package.path, adding...")
525-
package.path = package.path .. ";" .. path .. "/?.lua"
526-
log.msg(log.debug, "new package.path is " .. package.path)
527-
end
528-
restore_log_level(old_log_level)
529-
end
530-
531512
local function scan_scripts(script_dir)
532513
local old_log_level = set_log_level(sm.log_level)
533514
local script_count = 0
@@ -549,7 +530,7 @@ local function scan_scripts(script_dir)
549530
script_count = script_count + 1
550531
end
551532
else
552-
ensure_lib_in_search_path(line) -- but let's make sure libraries can be found
533+
-- ensure_lib_in_search_path(line) -- but let's make sure libraries can be found
553534
end
554535
end
555536
end

0 commit comments

Comments
 (0)