@@ -38,17 +38,6 @@ pub struct Directories {
38
38
windows_terminal_settings_files : Vec < PathBuf > ,
39
39
}
40
40
41
- fn shortcut_filename ( name : & str , env_name : Option < & String > , ext : Option < & str > ) -> String {
42
- let env = if let Some ( env_name) = env_name {
43
- format ! ( " ({env_name})" )
44
- } else {
45
- "" . to_string ( )
46
- } ;
47
-
48
- let ext = ext. unwrap_or ( "lnk" ) ;
49
- format ! ( "{name}{env}{ext}" )
50
- }
51
-
52
41
/// On Windows we can create shortcuts in several places:
53
42
/// - Start Menu
54
43
/// - Desktop
@@ -138,18 +127,13 @@ impl WindowsMenu {
138
127
) -> Self {
139
128
let name = command. name . resolve ( Environment :: Base , placeholders) ;
140
129
141
- let shortcut_name = shortcut_filename (
142
- & name,
143
- placeholders. as_ref ( ) . get ( "ENV_NAME" ) ,
144
- Some ( SHORTCUT_EXTENSION ) ,
145
- ) ;
130
+ let shortcut_name = format ! ( "{name}.{SHORTCUT_EXTENSION}" ) ;
146
131
147
132
let location = directories
148
133
. start_menu
149
134
. join ( & shortcut_name)
150
135
. with_extension ( SHORTCUT_EXTENSION ) ;
151
136
152
- // self.menu.start_menu_location / self._shortcut_filename()
153
137
Self {
154
138
prefix : prefix. to_path_buf ( ) ,
155
139
name,
@@ -194,10 +178,6 @@ impl WindowsMenu {
194
178
Ok ( lines. join ( "\n " ) )
195
179
}
196
180
197
- fn shortcut_filename ( & self , ext : Option < & str > ) -> String {
198
- shortcut_filename ( & self . name , self . placeholders . as_ref ( ) . get ( "ENV_NAME" ) , ext)
199
- }
200
-
201
181
fn write_script ( & self , path : & Path ) -> Result < ( ) , MenuInstError > {
202
182
if let Some ( parent) = path. parent ( ) {
203
183
fs:: create_dir_all ( parent) ?;
@@ -210,9 +190,7 @@ impl WindowsMenu {
210
190
}
211
191
212
192
fn path_for_script ( & self ) -> PathBuf {
213
- self . prefix
214
- . join ( "Menu" )
215
- . join ( self . shortcut_filename ( Some ( "bat" ) ) )
193
+ self . prefix . join ( "Menu" ) . join ( format ! ( "{}.bat" , & self . name) )
216
194
}
217
195
218
196
fn build_command ( & self , with_arg1 : bool ) -> Result < Vec < String > , MenuInstError > {
0 commit comments