diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2024-03-05 21:38:15 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2024-03-06 15:14:36 +0000 |
commit | f50f9d58ef5fe86363e5223b2b55075f6c4c636c (patch) | |
tree | a5a0905f1907405ea508922f2cf9f17b7276350e /src | |
parent | 8d30fc5bd2b352897b81756400ab50d2be859209 (diff) | |
download | luarocks-f50f9d58ef5fe86363e5223b2b55075f6c4c636c.tar.gz luarocks-f50f9d58ef5fe86363e5223b2b55075f6c4c636c.tar.bz2 luarocks-f50f9d58ef5fe86363e5223b2b55075f6c4c636c.zip |
fix(windows): parse slashes correctly when reading rock_manifest
Diffstat (limited to 'src')
-rw-r--r-- | src/luarocks/manif/writer.lua | 2 | ||||
-rw-r--r-- | src/luarocks/upload/api.lua | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/manif/writer.lua b/src/luarocks/manif/writer.lua index e39137c2..36f5f57f 100644 --- a/src/luarocks/manif/writer.lua +++ b/src/luarocks/manif/writer.lua | |||
@@ -267,7 +267,7 @@ function writer.make_rock_manifest(name, version) | |||
267 | local walk = tree | 267 | local walk = tree |
268 | local last | 268 | local last |
269 | local last_name | 269 | local last_name |
270 | for filename in file:gmatch("[^/]+") do | 270 | for filename in file:gmatch("[^\\/]+") do |
271 | local next = walk[filename] | 271 | local next = walk[filename] |
272 | if not next then | 272 | if not next then |
273 | next = {} | 273 | next = {} |
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua index 8e26f66a..e1413702 100644 --- a/src/luarocks/upload/api.lua +++ b/src/luarocks/upload/api.lua | |||
@@ -8,6 +8,7 @@ local util = require("luarocks.util") | |||
8 | local persist = require("luarocks.persist") | 8 | local persist = require("luarocks.persist") |
9 | local multipart = require("luarocks.upload.multipart") | 9 | local multipart = require("luarocks.upload.multipart") |
10 | local json = require("luarocks.vendor.dkjson") | 10 | local json = require("luarocks.vendor.dkjson") |
11 | local dir_sep = package.config:sub(1, 1) | ||
11 | 12 | ||
12 | local Api = {} | 13 | local Api = {} |
13 | 14 | ||
@@ -15,7 +16,7 @@ local function upload_config_file() | |||
15 | if not cfg.config_files.user.file then | 16 | if not cfg.config_files.user.file then |
16 | return nil | 17 | return nil |
17 | end | 18 | end |
18 | return (cfg.config_files.user.file:gsub("/[^/]+$", "/upload_config.lua")) | 19 | return (cfg.config_files.user.file:gsub("[\\/][^\\/]+$", dir_sep .. "upload_config.lua")) |
19 | end | 20 | end |
20 | 21 | ||
21 | function Api:load_config() | 22 | function Api:load_config() |