Skip to content

Commit 4d2f83e

Browse files
committed
fix(desktop): stage complete cua driver bundles
1 parent d296a0d commit 4d2f83e

2 files changed

Lines changed: 1 addition & 13 deletions

File tree

‎scripts/build-desktop-artifact.test.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
602602
assert.deepInclude(resolveCuaDriverAsset("linux", "x64"), {
603603
archiveName: "cua-driver-rs-0.12.2-linux-x86_64-binary.tar.gz",
604604
executablePath: "cua-driver",
605-
companionPaths: ["cua-cursor-theme", "wayland-helper"],
606605
});
607606
assert.deepInclude(resolveCuaDriverAsset("linux", "arm64"), {
608607
archiveName: "cua-driver-rs-0.12.2-linux-arm64-binary.tar.gz",
@@ -611,7 +610,6 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
611610
assert.deepInclude(resolveCuaDriverAsset("win", "x64"), {
612611
archiveName: "cua-driver-rs-0.12.2-windows-x86_64-binary.zip",
613612
executablePath: "cua-driver.exe",
614-
companionPaths: ["cua-cursor-theme.exe"],
615613
});
616614
assert.deepInclude(resolveCuaDriverAsset("win", "arm64"), {
617615
archiveName: "cua-driver-rs-0.12.2-windows-arm64-binary.zip",

‎scripts/build-desktop-artifact.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ export function resolveCuaDriverAsset(
198198
return {
199199
archiveName,
200200
executablePath: platform === "win" ? "cua-driver.exe" : "cua-driver",
201-
companionPaths:
202-
platform === "win" ? ["cua-cursor-theme.exe"] : ["cua-cursor-theme", "wayland-helper"],
203201
sha256: CUA_DRIVER_PLATFORM_SHA256[platform][arch],
204202
url: `${CUA_DRIVER_RELEASE_BASE_URL}/${archiveName}`,
205203
};
@@ -1815,17 +1813,9 @@ const stageCuaDriverExecutable = Effect.fn("stageCuaDriverExecutable")(function*
18151813
yield* fs.chmod(destination, 0o755);
18161814
} else {
18171815
const destination = path.join(input.stageResourcesDir, "cua-driver");
1818-
yield* fs.makeDirectory(destination, { recursive: true });
1819-
yield* fs.copyFile(
1820-
extractedExecutable,
1821-
path.join(destination, path.basename(asset.executablePath)),
1822-
);
1823-
for (const companionPath of "companionPaths" in asset ? asset.companionPaths : []) {
1824-
yield* fs.copy(path.join(extractDir, companionPath), path.join(destination, companionPath));
1825-
}
1816+
yield* fs.copy(extractDir, destination);
18261817
if (input.platform === "linux") {
18271818
yield* fs.chmod(path.join(destination, "cua-driver"), 0o755);
1828-
yield* fs.chmod(path.join(destination, "cua-cursor-theme"), 0o755);
18291819
}
18301820
}
18311821
yield* Effect.log(`[desktop-artifact] Staged Cua Driver ${CUA_DRIVER_RELEASE_VERSION}.`);

0 commit comments

Comments
 (0)