Fix one more whitespace after commands

This commit is contained in:
Jack251970 2025-06-15 21:21:46 +08:00
parent 58a47aa35d
commit 07f440768e

View file

@ -194,10 +194,12 @@ namespace Flow.Launcher.Plugin.Shell
var workingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); var workingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
var runAsAdministratorArg = !runAsAdministrator && !_settings.RunAsAdministrator ? "" : "runas"; var runAsAdministratorArg = !runAsAdministrator && !_settings.RunAsAdministrator ? "" : "runas";
ProcessStartInfo info = new() var info = new ProcessStartInfo()
{ {
Verb = runAsAdministratorArg, WorkingDirectory = workingDirectory, Verb = runAsAdministratorArg,
WorkingDirectory = workingDirectory,
}; };
var notifyStr = Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close");
switch (_settings.Shell) switch (_settings.Shell)
{ {
case Shell.Cmd: case Shell.Cmd:
@ -212,7 +214,11 @@ namespace Flow.Launcher.Plugin.Shell
info.FileName = "cmd.exe"; info.FileName = "cmd.exe";
} }
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" : "")}"); info.ArgumentList.Add(
$"{(_settings.LeaveShellOpen ? "/k" : "/c")} {command}" +
$"{(_settings.CloseShellAfterPress ?
$" && echo {notifyStr} && pause > nul /c" :
"")}");
break; break;
} }
@ -238,7 +244,11 @@ namespace Flow.Launcher.Plugin.Shell
else else
{ {
info.ArgumentList.Add("-Command"); info.ArgumentList.Add("-Command");
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" : "")}"); info.ArgumentList.Add(
$"{command}{addedCharacter};" +
$"{(_settings.CloseShellAfterPress ?
$" Write-Host '{notifyStr}'{addedCharacter}; [System.Console]::ReadKey(){addedCharacter}; exit" :
"")}");
} }
break; break;
} }
@ -262,7 +272,11 @@ namespace Flow.Launcher.Plugin.Shell
info.ArgumentList.Add("-NoExit"); info.ArgumentList.Add("-NoExit");
} }
info.ArgumentList.Add("-Command"); info.ArgumentList.Add("-Command");
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" : "")}"); info.ArgumentList.Add(
$"{command}{addedCharacter};" +
$"{(_settings.CloseShellAfterPress ?
$" Write-Host '{notifyStr}'{addedCharacter}; [System.Console]::ReadKey(){addedCharacter}; exit" :
"")}");
break; break;
} }