diff options
| -rw-r--r-- | .github/workflows/build.yml | 6 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | make.lua | 2 | ||||
| -rw-r--r-- | make/bootstrap.lua | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6788c37b..11ba5577 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,9 +18,9 @@ jobs: with: name: lua-language-server path: | - bin-Windows - bin-Linux - bin-macOS + bin/Windows + bin/Linux + bin/macOS resource: runs-on: ubuntu-latest steps: @@ -7,3 +7,4 @@ /bin-Windows /bin-Linux /bin-macOS +/bin @@ -2,7 +2,7 @@ local lm = require 'luamake' local platform = require 'bee.platform' local exe = platform.OS == 'Windows' and ".exe" or "" -lm.bindir = 'bin-' .. platform.OS +lm.bindir = 'bin/' .. platform.OS lm.EXE_DIR = "" lm:import "3rd/bee.lua/make.lua" diff --git a/make/bootstrap.lua b/make/bootstrap.lua index 36b9ce96..e9e61c77 100644 --- a/make/bootstrap.lua +++ b/make/bootstrap.lua @@ -49,7 +49,7 @@ local root; do sep = '/\\'
end
local pattern = "["..sep.."][^"..sep.."]+"
- root = package.cpath:match("([^;]+)"..pattern..pattern.."$")
+ root = package.cpath:match("([^;]+)"..pattern..pattern..pattern.."$")
arg[0] = root .. package.config:sub(1,1) .. 'main.lua'
end
root = root:gsub('[/\\]', package.config:sub(1,1))
|