Skip to content

Commit b243198

Browse files
committed
Fix linux binary-name to address build failures
1 parent f2fa1be commit b243198

File tree

8 files changed

+24
-15
lines changed

8 files changed

+24
-15
lines changed

bundle/deb/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Package: amazon-q
1+
Package: kiro-cli
22
Description: Amazon Q CLI for Linux
33
Maintainer: Amazon Q CLI Team <[email protected]>
44
Homepage: https://github.com/aws/q-cli
55
Version: $VERSION
66
Architecture: $APT_ARCH
7-
Conflicts: amazon-q-minimal
7+
Conflicts: kiro-cli-minimal
88
Depends: libayatana-appindicator3-1, libwebkit2gtk-4.1-0, libgtk-3-0, util-linux

bundle/deb/control_minimal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Package: amazon-q-minimal
1+
Package: kiro-cli-minimal
22
Description: Amazon Q CLI for Linux
33
Maintainer: Amazon Q CLI Team <[email protected]>
44
Homepage: https://github.com/aws/q-cli
55
Version: $VERSION
66
Architecture: $APT_ARCH
7-
Conflicts: amazon-q
7+
Conflicts: kiro-cli

bundle/deb/postrm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
killall q-desktop || true
3+
killall kiro-cli-desktop || true

crates/fig_desktop/src/install.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,9 @@ echo "{binary_name} {version}"
11341134
let entry_path = appimage_desktop_entry_path(&ctx).unwrap();
11351135
let icon_path = appimage_desktop_entry_icon_path(&ctx).unwrap();
11361136
fs.create_dir_all(&entry_path.parent().unwrap()).await.unwrap();
1137-
fs.write(&entry_path, "[Desktop Entry]\nExec=q-desktop").await.unwrap();
1137+
fs.write(&entry_path, "[Desktop Entry]\nExec=kiro-cli-desktop")
1138+
.await
1139+
.unwrap();
11381140
fs.create_dir_all(icon_path.parent().unwrap()).await.unwrap();
11391141
fs.write(&icon_path, "image").await.unwrap();
11401142
let state = State::from_slice(&[("appimage.manageDesktopEntry", true.into())]);
@@ -1159,7 +1161,9 @@ echo "{binary_name} {version}"
11591161
let entry_path = appimage_desktop_entry_path(&ctx).unwrap();
11601162
let icon_path = appimage_desktop_entry_icon_path(&ctx).unwrap();
11611163
fs.create_dir_all(&entry_path.parent().unwrap()).await.unwrap();
1162-
fs.write(&entry_path, "[Desktop Entry]\nExec=q-desktop").await.unwrap();
1164+
fs.write(&entry_path, "[Desktop Entry]\nExec=kiro-cli-desktop")
1165+
.await
1166+
.unwrap();
11631167
fs.create_dir_all(icon_path.parent().unwrap()).await.unwrap();
11641168
fs.write(&icon_path, "image").await.unwrap();
11651169
let state = State::new_fake();

crates/fig_desktop/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"distDir": []
44
},
55
"package": {
6-
"productName": "q_desktop"
6+
"productName": "kiro_cli_desktop"
77
},
88
"tauri": {
99
"bundle": {

crates/fig_desktop_api/src/requests/install.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ where
228228
.env()
229229
.current_dir()
230230
.map_err(super::Error::from_std)?
231-
.join("share/applications/q-desktop.desktop");
231+
.join("share/applications/kiro-cli-desktop.desktop");
232232
let icon_path = ctx
233233
.env()
234234
.current_dir()
235235
.map_err(super::Error::from_std)?
236-
.join("share/icons/hicolor/128x128/apps/q-desktop.png");
236+
.join("share/icons/hicolor/128x128/apps/kiro-cli-desktop.png");
237237
let desktop_integration =
238238
DesktopEntryIntegration::new(ctx, Some(entry_path), Some(icon_path), Some(exec_path.into()));
239239
match action {
@@ -409,7 +409,9 @@ mod tests {
409409
let entry_path = appimage_desktop_entry_path(&ctx).unwrap();
410410
let icon_path = appimage_desktop_entry_icon_path(&ctx).unwrap();
411411
fs.create_dir_all(entry_path.parent().unwrap()).await.unwrap();
412-
fs.write(&entry_path, "[Desktop Entry]\nExec=q-desktop").await.unwrap();
412+
fs.write(&entry_path, "[Desktop Entry]\nExec=kiro-cli-desktop")
413+
.await
414+
.unwrap();
413415
fs.create_dir_all(icon_path.parent().unwrap()).await.unwrap();
414416
fs.write(&icon_path, "image").await.unwrap();
415417
let ctx = TestContext {

crates/fig_integrations/src/desktop_entry.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ mod tests {
393393

394394
const TEST_DESKTOP_ENTRY: &str = r#"[Desktop Entry]
395395
Categories=Development;
396-
Exec=q-desktop
397-
Icon=q-desktop
396+
Exec=kiro-cli-desktop
397+
Icon=kiro-cli-desktop
398398
Name=q_desktop
399399
Terminal=false
400400
Type=Application"#;

crates/fig_util/src/directories.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,10 @@ pub fn appimage_desktop_entry_path<Ctx: EnvProvider>(ctx: &Ctx) -> Result<PathBu
520520
if !ctx.env().in_appimage() {
521521
return Err(DirectoryError::NotAppImage);
522522
}
523-
Ok(ctx.env().current_dir()?.join("share/applications/q-desktop.desktop"))
523+
Ok(ctx
524+
.env()
525+
.current_dir()?
526+
.join("share/applications/kiro-cli-desktop.desktop"))
524527
}
525528

526529
/// The path to the icon bundled with the AppImage to be used for the desktop entry file.
@@ -533,7 +536,7 @@ pub fn appimage_desktop_entry_icon_path<Ctx: EnvProvider>(ctx: &Ctx) -> Result<P
533536
Ok(ctx
534537
.env()
535538
.current_dir()?
536-
.join("share/icons/hicolor/128x128/apps/q-desktop.png"))
539+
.join("share/icons/hicolor/128x128/apps/kiro-cli-desktop.png"))
537540
}
538541

539542
/// The path to the data directory auto-created by the Linux windowing application.

0 commit comments

Comments
 (0)