From cd121f28282007d261046a3ab6f6e680830297d6 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Thu, 16 Jan 2025 15:34:18 -0800 Subject: [PATCH] fix: messy ui for package types in bundle --- packages/cli/src/cli/bundle.rs | 11 ----------- packages/cli/src/config/bundle.rs | 28 +++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/packages/cli/src/cli/bundle.rs b/packages/cli/src/cli/bundle.rs index cb07393c84..09587ddd57 100644 --- a/packages/cli/src/cli/bundle.rs +++ b/packages/cli/src/cli/bundle.rs @@ -10,17 +10,6 @@ use super::*; #[derive(Clone, Debug, Parser)] pub struct Bundle { /// The package types to bundle - /// - /// Any of: - /// - macos: The macOS application bundle (.app). - /// - ios: The iOS app bundle. - /// - msi: The Windows bundle (.msi). - /// - nsis: The NSIS bundle (.exe). - /// - deb: The Linux Debian package bundle (.deb). - /// - rpm: The Linux RPM bundle (.rpm). - /// - appimage: The Linux AppImage bundle (.AppImage). - /// - dmg: The macOS DMG bundle (.dmg). - /// - updater: The Updater bundle. #[clap(long)] pub package_types: Option>, diff --git a/packages/cli/src/config/bundle.rs b/packages/cli/src/config/bundle.rs index ec9fe23b11..a61659e8a2 100644 --- a/packages/cli/src/config/bundle.rs +++ b/packages/cli/src/config/bundle.rs @@ -191,16 +191,42 @@ pub struct CustomSignCommandSettings { pub args: Vec, } -#[derive(Clone, Copy, Debug)] +#[derive(Clone, Copy, Debug, clap::ValueEnum)] pub(crate) enum PackageType { + /// The macOS application bundle (.app). + #[clap(name = "macos")] MacOsBundle, + + /// The iOS app bundle. + #[clap(name = "ios")] IosBundle, + + /// The Windows bundle (.msi). + #[clap(name = "msi")] WindowsMsi, + + /// The NSIS bundle (.exe). + #[clap(name = "nsis")] Nsis, + + /// The Linux Debian package bundle (.deb). + #[clap(name = "deb")] Deb, + + /// The Linux RPM bundle (.rpm). + #[clap(name = "rpm")] Rpm, + + /// The Linux AppImage bundle (.AppImage). + #[clap(name = "appimage")] AppImage, + + /// The macOS DMG bundle (.dmg). + #[clap(name = "dmg")] Dmg, + + /// The Updater bundle (a patch of an existing app) + #[clap(name = "updater")] Updater, }