diff options
| author | ruki <[email protected]> | 2024-08-05 10:48:21 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-08-05 10:48:21 +0800 |
| commit | bb3b924c3b111904909592f51f9660d5c5b9c005 (patch) | |
| tree | c9ae9501c64a00247c3f6e8cb40b4698db1206e1 | |
| parent | 93951588a6e1b04236262b4bdaceab07a695ea7e (diff) | |
| parent | 9e32bd42056cb4b2fbe5785d103502fd29dbcf38 (diff) | |
Merge pull request #5414 from jinke18/dev-jk240730-1
fixbug:nsis pack only support ascii path without blank space
| -rw-r--r-- | xmake/plugins/pack/nsis/main.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/plugins/pack/nsis/main.lua b/xmake/plugins/pack/nsis/main.lua index ac6d008b7..4ab5f8d8e 100644 --- a/xmake/plugins/pack/nsis/main.lua +++ b/xmake/plugins/pack/nsis/main.lua @@ -113,7 +113,7 @@ function _get_command_strings(package, cmd, opt) local dstname = path.filename(dstfile) local dstdir = path.normalize(path.directory(dstfile)) table.insert(result, string.format("SetOutPath \"%s\"", dstdir)) - table.insert(result, string.format("File /oname=%s \"%s\"", dstname, srcfile)) + table.insert(result, string.format("File \"/oname=%s\" \"%s\"", dstname, srcfile)) end elseif kind == "rm" then local filepath = _translate_filepath(package, cmd.filepath) @@ -268,7 +268,7 @@ function _pack_nsis(makensis, package) local specvars_values = {} io.gsub(specfile, "(" .. pattern .. ")", function(_, name) table.insert(specvars_names, name) - end) + end, {encoding = "ansi"}) for _, name in ipairs(specvars_names) do name = name:trim() if specvars_values[name] == nil then @@ -288,7 +288,7 @@ function _pack_nsis(makensis, package) io.gsub(specfile, "(" .. pattern .. ")", function(_, name) name = name:trim() return specvars_values[name] - end) + end, {encoding = "ansi"}) -- make package os.vrunv(makensis, {specfile}) |