Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

Fix win32 arm64 update info file overwrites x64 file #1253

Merged
merged 1 commit into from
Dec 25, 2020
Merged

Fix win32 arm64 update info file overwrites x64 file #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions patches/app-builder-lib+22.10.3.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
diff --git a/node_modules/app-builder-lib/out/publish/updateInfoBuilder.js b/node_modules/app-builder-lib/out/publish/updateInfoBuilder.js
index 180d84a..0e9925a 100644
--- a/node_modules/app-builder-lib/out/publish/updateInfoBuilder.js
+++ b/node_modules/app-builder-lib/out/publish/updateInfoBuilder.js
@@ -147,7 +147,7 @@ function getUpdateInfoFileName(channel, packager, arch) {
}

function getArchPrefixForUpdateFile(arch, packager) {
- if (arch == null || arch === _builderUtil().Arch.x64 || packager.platform !== _core().Platform.LINUX) {
+ if (arch == null || arch === _builderUtil().Arch.x64 || packager.platform === _core().Platform.MAC) {
return "";
}

diff --git a/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh b/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh
index 886bebc..80fef38 100644
--- a/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh
Expand Down
18 changes: 18 additions & 0 deletions patches/electron-updater+4.3.7.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/node_modules/electron-updater/out/providers/Provider.js b/node_modules/electron-updater/out/providers/Provider.js
index f174c7b..b0cae4f 100644
--- a/node_modules/electron-updater/out/providers/Provider.js
+++ b/node_modules/electron-updater/out/providers/Provider.js
@@ -55,8 +55,12 @@ class Provider {
const arch = process.env.TEST_UPDATER_ARCH || process.arch;
const archSuffix = arch === "x64" ? "" : `-${arch}`;
return "-linux" + archSuffix;
+ } else if (this.runtimeOptions.platform === "darwin") {
+ return "-mac";
} else {
- return this.runtimeOptions.platform === "darwin" ? "-mac" : "";
+ // win32
+ const arch = process.env.TEST_UPDATER_ARCH || process.arch;
+ return arch === "x64" ? "" : `-${arch}`;
}
} // due to historical reasons for windows we use channel name without platform specifier