From f50f9d58ef5fe86363e5223b2b55075f6c4c636c Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 5 Mar 2024 21:38:15 -0300 Subject: fix(windows): parse slashes correctly when reading rock_manifest --- src/luarocks/manif/writer.lua | 2 +- src/luarocks/upload/api.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') 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) local walk = tree local last local last_name - for filename in file:gmatch("[^/]+") do + for filename in file:gmatch("[^\\/]+") do local next = walk[filename] if not next then 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") local persist = require("luarocks.persist") local multipart = require("luarocks.upload.multipart") local json = require("luarocks.vendor.dkjson") +local dir_sep = package.config:sub(1, 1) local Api = {} @@ -15,7 +16,7 @@ local function upload_config_file() if not cfg.config_files.user.file then return nil end - return (cfg.config_files.user.file:gsub("/[^/]+$", "/upload_config.lua")) + return (cfg.config_files.user.file:gsub("[\\/][^\\/]+$", dir_sep .. "upload_config.lua")) end function Api:load_config() -- cgit v1.2.3-55-g6feb