tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: Updates the printing of echo for script commands to after the @ checking. 

The add and remove are really a move of the code block from before the @ parsing into the else block.

Signed-off-by: jcarsey
Reviewed-by: leegrosenbaum

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12741 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey 2011-11-18 18:58:25 +00:00
parent 73c83c69c0
commit 0d11446d51
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ShellPkg/Application/Shell/Shell.c
View File

@ -1815,15 +1815,6 @@ RunScriptFileHandle (
// //
} else { } else {
if (CommandLine3 != NULL && StrLen(CommandLine3) > 0) { if (CommandLine3 != NULL && StrLen(CommandLine3) > 0) {
if (ShellCommandGetEchoState()) {
CurDir = ShellInfoObject.NewEfiShellProtocol->GetEnv(L"cwd");
if (CurDir != NULL && StrLen(CurDir) > 1) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_CURDIR), ShellInfoObject.HiiHandle, CurDir);
} else {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_SHELL), ShellInfoObject.HiiHandle);
}
ShellPrintEx(-1, -1, L"%s\r\n", CommandLine2);
}
if (CommandLine3[0] == L'@') { if (CommandLine3[0] == L'@') {
// //
// We need to save the current echo state // We need to save the current echo state
@ -1838,6 +1829,15 @@ RunScriptFileHandle (
// //
ShellCommandSetEchoState(PreCommandEchoState); ShellCommandSetEchoState(PreCommandEchoState);
} else { } else {
if (ShellCommandGetEchoState()) {
CurDir = ShellInfoObject.NewEfiShellProtocol->GetEnv(L"cwd");
if (CurDir != NULL && StrLen(CurDir) > 1) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_CURDIR), ShellInfoObject.HiiHandle, CurDir);
} else {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_SHELL), ShellInfoObject.HiiHandle);
}
ShellPrintEx(-1, -1, L"%s\r\n", CommandLine2);
}
Status = RunCommand(CommandLine3); Status = RunCommand(CommandLine3);
} }
} }