diff options
| -rw-r--r-- | platform.lua | 20 | ||||
| -rw-r--r-- | script-beta/debugger.lua | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/platform.lua b/platform.lua index 5a4751b7..db62f939 100644 --- a/platform.lua +++ b/platform.lua @@ -9,11 +9,21 @@ local function findExePath() end local exePath = findExePath() -local exeDir = exePath:gsub('[^/\\]-$', '') -local dll = exePath:sub(-4) == '.exe' and '.dll' or '.so' -package.cpath = exeDir .. '?' .. dll -if not package.loadlib(exeDir..'bee'..dll, 'luaopen_bee_platform') then - error([[It doesn't seem to support your OS, please build it in your OS, see https://github.com/sumneko/vscode-lua/wiki/Build]]) +local exeDir = exePath:match('(.+)[/\\][%w_.-]+$') +local dll = package.cpath:match '[/\\]%?%.([a-z]+)' +package.cpath = ('%s/?.%s'):format(exeDir, dll) +if not package.loadlib(exeDir..'/bee.'..dll, 'luaopen_bee_platform') then + error(([[It doesn't seem to support your OS, please build it in your OS, see https://github.com/sumneko/vscode-lua/wiki/Build +exePath: %s +exeDir: %s +dll: %s +cpath: %s +]]):format( + exePath, + exeDir, + dll, + package.cpath +)) end local fs = require 'bee.filesystem' diff --git a/script-beta/debugger.lua b/script-beta/debugger.lua index 113fa687..b77cbb0f 100644 --- a/script-beta/debugger.lua +++ b/script-beta/debugger.lua @@ -1,6 +1,6 @@ local wait = ... local fs = require 'bee.filesystem' -local extensionPath = fs.path(os.getenv 'USERPROFILE') / '.vscode' / 'extensions' +local extensionPath = fs.path(os.getenv 'USERPROFILE' or '') / '.vscode' / 'extensions' log.debug('Search extensions at:', extensionPath:string()) if not fs.is_directory(extensionPath) then log.debug('Extension path is not a directory.') |