Skip to content

Commit 6a9ccd6

Browse files
authored
Merge pull request #991 from danielcadev/agent/fix-updater-fallback-bundle-inputs
Fix updater fallback bundle inputs
2 parents c666058 + d29e2cf commit 6a9ccd6

3 files changed

Lines changed: 29 additions & 4 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

updater/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "codex-update-manager"
3-
version = "0.10.0"
3+
version = "0.10.1"
44
edition = "2021"
55

66
[dependencies]

updater/src/builder.rs

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ use tracing::info;
1616

1717
const UPDATE_BUILDER_MANIFEST: &str = ".codex-linux/update-builder-manifest.txt";
1818

19-
const REQUIRED_BUNDLE_FILES: [(&str, &str); 20] = [
19+
const REQUIRED_BUNDLE_FILES: [(&str, &str); 22] = [
2020
("Cargo.toml", "Cargo.toml"),
2121
("Cargo.lock", "Cargo.lock"),
2222
("computer-use-linux", "computer-use-linux"),
23+
("notification-actions-linux", "notification-actions-linux"),
2324
("read-aloud-linux", "read-aloud-linux"),
2425
("record-replay-linux", "record-replay-linux"),
2526
("updater", "updater"),
@@ -32,6 +33,7 @@ const REQUIRED_BUNDLE_FILES: [(&str, &str); 20] = [
3233
"plugins/openai-bundled/plugins/read-aloud",
3334
),
3435
("install.sh", "install.sh"),
36+
("launcher/cli-launch-path.py", "launcher/cli-launch-path.py"),
3537
("launcher/start.sh.template", "launcher/start.sh.template"),
3638
("launcher/webview-server.py", "launcher/webview-server.py"),
3739
("scripts/build-deb.sh", "scripts/build-deb.sh"),
@@ -616,7 +618,7 @@ touch "${DIST_DIR_OVERRIDE}/codex-desktop-${VER}-1-x86_64.pkg.tar.zst"
616618
fn write_fake_computer_use_bundle(root: &Path) -> Result<()> {
617619
fs::write(
618620
root.join("Cargo.toml"),
619-
b"[workspace]\nmembers = [\"computer-use-linux\", \"read-aloud-linux\", \"record-replay-linux\", \"updater\"]\n",
621+
b"[workspace]\nmembers = [\"computer-use-linux\", \"notification-actions-linux\", \"read-aloud-linux\", \"record-replay-linux\", \"updater\"]\n",
620622
)?;
621623
fs::write(root.join("Cargo.lock"), b"# fake lock\n")?;
622624
fs::create_dir_all(root.join("computer-use-linux/src"))?;
@@ -628,6 +630,15 @@ touch "${DIST_DIR_OVERRIDE}/codex-desktop-${VER}-1-x86_64.pkg.tar.zst"
628630
root.join("computer-use-linux/src/main.rs"),
629631
b"fn main() {}\n",
630632
)?;
633+
fs::create_dir_all(root.join("notification-actions-linux/src"))?;
634+
fs::write(
635+
root.join("notification-actions-linux/Cargo.toml"),
636+
b"[package]\nname = \"codex-notification-actions-linux\"\nversion = \"0.1.0\"\nedition = \"2021\"\n",
637+
)?;
638+
fs::write(
639+
root.join("notification-actions-linux/src/main.rs"),
640+
b"fn main() {}\n",
641+
)?;
631642
fs::create_dir_all(root.join("read-aloud-linux/src"))?;
632643
fs::write(
633644
root.join("read-aloud-linux/Cargo.toml"),
@@ -735,6 +746,10 @@ touch "${DIST_DIR_OVERRIDE}/codex-desktop-${VER}-1-x86_64.pkg.tar.zst"
735746
bundle_root.join(".codex-linux/source-info.json"),
736747
b"{\"commit\":\"0123456789012345678901234567890123456789\",\"version\":\"0.8.1\"}\n",
737748
)?;
749+
fs::write(
750+
bundle_root.join("launcher/cli-launch-path.py"),
751+
b"# fake CLI launch path helper\n",
752+
)?;
738753
fs::write(
739754
bundle_root.join("launcher/start.sh.template"),
740755
b"# fake launcher template\n",
@@ -949,6 +964,10 @@ fi
949964
write_fake_linux_features_bundle(&source_root)?;
950965
write_fake_patch_bundle(&source_root)?;
951966
fs::write(source_root.join("install.sh"), b"#!/bin/bash\n")?;
967+
fs::write(
968+
source_root.join("launcher/cli-launch-path.py"),
969+
b"# fake CLI launch path helper\n",
970+
)?;
952971
fs::write(
953972
source_root.join("launcher/start.sh.template"),
954973
b"# fake launcher template\n",
@@ -994,10 +1013,16 @@ fi
9941013
assert!(destination_root.join("launcher/webview-server.py").exists());
9951014
assert_fresh_patch_bundle(&destination_root);
9961015
assert!(destination_root.join("computer-use-linux").exists());
1016+
assert!(destination_root
1017+
.join("notification-actions-linux/Cargo.toml")
1018+
.exists());
9971019
assert!(!destination_root.join("global-dictation-linux").exists());
9981020
assert!(destination_root.join("read-aloud-linux").exists());
9991021
assert!(destination_root.join("record-replay-linux").exists());
10001022
assert!(destination_root.join("updater").exists());
1023+
assert!(destination_root
1024+
.join("launcher/cli-launch-path.py")
1025+
.exists());
10011026
assert!(destination_root.join("assets/codex-linux.png").exists());
10021027
assert!(destination_root
10031028
.join("plugins/openai-bundled/plugins/computer-use/.mcp.json")

0 commit comments

Comments
 (0)