Skip to content

Commit f50d26d

Browse files
ericpromislowjandubois
authored andcommitted
Copy the signed privilege-helper.exe to the source area.
Stop signing kuberlr.exe Signed-off-by: Eric Promislow <[email protected]> (cherry picked from commit 8966d32)
1 parent 037f3d8 commit f50d26d

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

scripts/lib/sign-win32.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ export async function sign(workDir: string) {
5151
defaults(config.win, DEFAULT_WINDOWS_CONFIG);
5252

5353
// Sign individual files. See https://github.com/electron-userland/electron-builder/issues/5968
54+
// We built this docker.exe, so we need to sign it
55+
5456
const unpackedDir = path.join(workDir, 'unpacked');
5557
const resourcesRootDir = 'resources/resources/win32';
5658
const internalDir = path.join(resourcesRootDir, 'internal');
@@ -59,16 +61,9 @@ export async function sign(workDir: string) {
5961
'.': ['Rancher Desktop.exe'],
6062
[resourcesRootDir]: ['wsl-helper.exe'],
6163
[internalDir]: ['host-resolver.exe', 'privileged-service.exe', 'steve.exe', 'vtunnel.exe'],
62-
[binDir]: ['docker.exe', 'docker-credential-none.exe', 'kuberlr.exe', 'nerdctl.exe', 'rdctl.exe'],
64+
[binDir]: ['docker.exe', 'docker-credential-none.exe', 'nerdctl.exe', 'rdctl.exe'],
6365
};
6466

65-
// make privileged-service.exe available to the installer during signing
66-
const privilegedServiceFile = 'privileged-service.exe';
67-
const privilegedServiceFrom = path.join(unpackedDir, internalDir, privilegedServiceFile);
68-
const privilegedServiceTo = path.join(process.cwd(), 'resources/win32/internal', privilegedServiceFile);
69-
70-
await fs.promises.copyFile(privilegedServiceFrom, privilegedServiceTo);
71-
7267
const toolPath = path.join(await getSignVendorPath(), 'windows-10', process.arch, 'signtool.exe');
7368
const toolArgs = [
7469
'sign',
@@ -96,6 +91,13 @@ export async function sign(workDir: string) {
9691
}
9792
}
9893

94+
// make privileged-service.exe available to the installer during signing
95+
const privilegedServiceFile = 'privileged-service.exe';
96+
const privilegedServiceFrom = path.join(unpackedDir, internalDir, privilegedServiceFile);
97+
const privilegedServiceTo = path.join(process.cwd(), 'resources/win32/internal', privilegedServiceFile);
98+
99+
await fs.promises.copyFile(privilegedServiceFrom, privilegedServiceTo);
100+
99101
// Generate an electron-builder.yml forcing the use of the cert.
100102
const newConfigPath = path.join(workDir, 'electron-builder.yml');
101103

0 commit comments

Comments
 (0)