Skip to content

Commit 7a37cef

Browse files
rkistnerdevelar
authored andcommitted
fix(Squirrel.Windows): Remove encodeUri from squirrel-windows packaging
Close #2557, Close #2558
1 parent c57c52a commit 7a37cef

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

packages/electron-builder-squirrel-windows/src/squirrelPack.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ async function pack(options: SquirrelOptions, directory: string, updateFile: str
165165
</metadata>
166166
</package>`
167167
debug(`Created NuSpec file:\n${nuspecContent}`)
168-
archive.append(nuspecContent.replace(/\n/, "\r\n"), {name: `${encodeURI(options.name).replace(/%5B/g, "[").replace(/%5D/g, "]")}.nuspec`})
168+
archive.append(nuspecContent.replace(/\n/, "\r\n"), {name: `${options.name}.nuspec`})
169169

170170
//noinspection SpellCheckingInspection
171171
archive.append(`<?xml version="1.0" encoding="utf-8"?>
@@ -241,8 +241,7 @@ async function encodedZip(archive: any, dir: string, prefix: string, vendorPath:
241241
return
242242
}
243243

244-
// GBK file name encoding (or Non-English file name) caused a problem
245-
const relativeSafeFilePath = encodeURI(file.substring(dir.length + 1).replace(/\\/g, "/")).replace(/%5B/g, "[").replace(/%5D/g, "]")
244+
const relativeSafeFilePath = file.substring(dir.length + 1).replace(/\\/g, "/")
246245
archive._append(file, {
247246
name: relativeSafeFilePath,
248247
prefix,

test/out/windows/__snapshots__/squirrelWindowsTest.js.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ Array [
7777
"lib/net45/node.dll",
7878
"lib/net45/pdf_viewer_resources.pak",
7979
"lib/net45/snapshot_blob.bin",
80-
"lib/net45/Test%20App%20%C3%9FW.exe",
81-
"lib/net45/Test%20App%20%C3%9FW_ExecutionStub.exe",
80+
"lib/net45/Test App ßW.exe",
81+
"lib/net45/Test App ßW_ExecutionStub.exe",
8282
"lib/net45/ucrtbase.dll",
8383
"lib/net45/ui_resources_200_percent.pak",
8484
"lib/net45/Update.exe",
@@ -175,8 +175,8 @@ Array [
175175
"lib/net45/node.dll",
176176
"lib/net45/pdf_viewer_resources.pak",
177177
"lib/net45/snapshot_blob.bin",
178-
"lib/net45/Test%20App%20%C3%9FW.exe",
179-
"lib/net45/Test%20App%20%C3%9FW_ExecutionStub.exe",
178+
"lib/net45/Test App ßW.exe",
179+
"lib/net45/Test App ßW_ExecutionStub.exe",
180180
"lib/net45/ucrtbase.dll",
181181
"lib/net45/ui_resources_200_percent.pak",
182182
"lib/net45/Update.exe",

0 commit comments

Comments
 (0)