@@ -194,10 +194,12 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
194
194
var workingDirectory = Environment . GetFolderPath ( Environment . SpecialFolder . UserProfile ) ;
195
195
var runAsAdministratorArg = ! runAsAdministrator && ! _settings . RunAsAdministrator ? "" : "runas" ;
196
196
197
- ProcessStartInfo info = new ( )
197
+ var info = new ProcessStartInfo ( )
198
198
{
199
- Verb = runAsAdministratorArg , WorkingDirectory = workingDirectory ,
199
+ Verb = runAsAdministratorArg ,
200
+ WorkingDirectory = workingDirectory ,
200
201
} ;
202
+ var notifyStr = Context . API . GetTranslation ( "flowlauncher_plugin_cmd_press_any_key_to_close" ) ;
201
203
switch ( _settings . Shell )
202
204
{
203
205
case Shell . Cmd :
@@ -212,7 +214,11 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
212
214
info . FileName = "cmd.exe" ;
213
215
}
214
216
215
- info . ArgumentList . Add ( $ "{ ( _settings . LeaveShellOpen ? "/k" : "/c" ) } { command } { ( _settings . CloseShellAfterPress ? $ "&& echo { Context . API . GetTranslation ( "flowlauncher_plugin_cmd_press_any_key_to_close" ) } && pause > nul /c" : "" ) } ") ;
217
+ info . ArgumentList . Add (
218
+ $ "{ ( _settings . LeaveShellOpen ? "/k" : "/c" ) } { command } " +
219
+ $ "{ ( _settings . CloseShellAfterPress ?
220
+ $ " && echo { notifyStr } && pause > nul /c" :
221
+ "" ) } " ) ;
216
222
break ;
217
223
}
218
224
@@ -238,7 +244,11 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
238
244
else
239
245
{
240
246
info . ArgumentList . Add ( "-Command" ) ;
241
- info . ArgumentList . Add ( $ "{ command } { addedCharacter } ; { ( _settings . CloseShellAfterPress ? $ "Write-Host '{ Context . API . GetTranslation ( "flowlauncher_plugin_cmd_press_any_key_to_close" ) } '{ addedCharacter } ; [System.Console]::ReadKey(){ addedCharacter } ; exit" : "" ) } ") ;
247
+ info . ArgumentList . Add (
248
+ $ "{ command } { addedCharacter } ;" +
249
+ $ "{ ( _settings . CloseShellAfterPress ?
250
+ $ " Write-Host '{ notifyStr } '{ addedCharacter } ; [System.Console]::ReadKey(){ addedCharacter } ; exit" :
251
+ "" ) } " ) ;
242
252
}
243
253
break ;
244
254
}
@@ -262,7 +272,11 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
262
272
info . ArgumentList . Add ( "-NoExit" ) ;
263
273
}
264
274
info . ArgumentList . Add ( "-Command" ) ;
265
- info . ArgumentList . Add ( $ "{ command } { addedCharacter } ; { ( _settings . CloseShellAfterPress ? $ "Write-Host '{ Context . API . GetTranslation ( "flowlauncher_plugin_cmd_press_any_key_to_close" ) } '{ addedCharacter } ; [System.Console]::ReadKey(){ addedCharacter } ; exit" : "" ) } ") ;
275
+ info . ArgumentList . Add (
276
+ $ "{ command } { addedCharacter } ;" +
277
+ $ "{ ( _settings . CloseShellAfterPress ?
278
+ $ " Write-Host '{ notifyStr } '{ addedCharacter } ; [System.Console]::ReadKey(){ addedCharacter } ; exit" :
279
+ "" ) } " ) ;
266
280
break ;
267
281
}
268
282
0 commit comments