From 41506faaa9312b14dc3a833e4fa44dd9a131fb85 Mon Sep 17 00:00:00 2001 From: Hofer-Julian <30049909+Hofer-Julian@users.noreply.github.com> Date: Tue, 4 Mar 2025 11:23:22 +0100 Subject: [PATCH] fix: shortcut filename (#1136) Co-authored-by: Wolf Vollprecht Co-authored-by: Ruben Arts --- crates/rattler_menuinst/src/windows.rs | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/crates/rattler_menuinst/src/windows.rs b/crates/rattler_menuinst/src/windows.rs index d35fd0f09..b40530113 100644 --- a/crates/rattler_menuinst/src/windows.rs +++ b/crates/rattler_menuinst/src/windows.rs @@ -38,17 +38,6 @@ pub struct Directories { windows_terminal_settings_files: Vec, } -fn shortcut_filename(name: &str, env_name: Option<&String>, ext: Option<&str>) -> String { - let env = if let Some(env_name) = env_name { - format!(" ({env_name})") - } else { - "".to_string() - }; - - let ext = ext.unwrap_or("lnk"); - format!("{name}{env}{ext}") -} - /// On Windows we can create shortcuts in several places: /// - Start Menu /// - Desktop @@ -138,18 +127,13 @@ impl WindowsMenu { ) -> Self { let name = command.name.resolve(Environment::Base, placeholders); - let shortcut_name = shortcut_filename( - &name, - placeholders.as_ref().get("ENV_NAME"), - Some(SHORTCUT_EXTENSION), - ); + let shortcut_name = format!("{name}.{SHORTCUT_EXTENSION}"); let location = directories .start_menu .join(&shortcut_name) .with_extension(SHORTCUT_EXTENSION); - // self.menu.start_menu_location / self._shortcut_filename() Self { prefix: prefix.to_path_buf(), name, @@ -194,10 +178,6 @@ impl WindowsMenu { Ok(lines.join("\n")) } - fn shortcut_filename(&self, ext: Option<&str>) -> String { - shortcut_filename(&self.name, self.placeholders.as_ref().get("ENV_NAME"), ext) - } - fn write_script(&self, path: &Path) -> Result<(), MenuInstError> { if let Some(parent) = path.parent() { fs::create_dir_all(parent)?; @@ -210,9 +190,7 @@ impl WindowsMenu { } fn path_for_script(&self) -> PathBuf { - self.prefix - .join("Menu") - .join(self.shortcut_filename(Some("bat"))) + self.prefix.join("Menu").join(format!("{}.bat", &self.name)) } fn build_command(&self, with_arg1: bool) -> Result, MenuInstError> {