From 5a748e5cbba23b4ef884c6aeb16b175beb03dff9 Mon Sep 17 00:00:00 2001 From: ripsaw8080 Date: Mon, 17 Aug 2015 15:06:28 +0000 Subject: [PATCH] Display a simple startup message for sub-shells instead of the welcome banner. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3930 --- src/shell/shell.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp index f7f8a4b5..2502b333 100644 --- a/src/shell/shell.cpp +++ b/src/shell/shell.cpp @@ -296,18 +296,20 @@ void DOS_Shell::Run(void) { return; } /* Start a normal shell and check for a first command init */ - WriteOut(MSG_Get("SHELL_STARTUP_BEGIN"),VERSION); -#if C_DEBUG - WriteOut(MSG_Get("SHELL_STARTUP_DEBUG")); -#endif - if (machine == MCH_CGA) WriteOut(MSG_Get("SHELL_STARTUP_CGA")); - if (machine == MCH_HERC) WriteOut(MSG_Get("SHELL_STARTUP_HERC")); - WriteOut(MSG_Get("SHELL_STARTUP_END")); - if (cmd->FindString("/INIT",line,true)) { + WriteOut(MSG_Get("SHELL_STARTUP_BEGIN"),VERSION); +#if C_DEBUG + WriteOut(MSG_Get("SHELL_STARTUP_DEBUG")); +#endif + if (machine == MCH_CGA) WriteOut(MSG_Get("SHELL_STARTUP_CGA")); + if (machine == MCH_HERC) WriteOut(MSG_Get("SHELL_STARTUP_HERC")); + WriteOut(MSG_Get("SHELL_STARTUP_END")); + strcpy(input_line,line.c_str()); line.erase(); ParseLine(input_line); + } else { + WriteOut(MSG_Get("SHELL_STARTUP_SUB"),VERSION); } do { if (bf){ @@ -542,6 +544,7 @@ void SHELL_Init() { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xBC\033[0m\n" //"\n" //Breaks the startup message if you type a mount and a drive change. ); + MSG_Add("SHELL_STARTUP_SUB","\n\n\033[32;1mDOSBox %s Command Shell\033[0m\n\n"); MSG_Add("SHELL_CMD_CHDIR_HELP","Displays/changes the current directory.\n"); MSG_Add("SHELL_CMD_CHDIR_HELP_LONG","CHDIR [drive:][path]\n" "CHDIR [..]\n"