From f986e59659601108e64cf3475da99ca7b42c6f37 Mon Sep 17 00:00:00 2001 From: AShifter Date: Tue, 21 Nov 2017 15:26:14 -0700 Subject: fixed invalid command handling yoy it works --- ShiftOS.Main/Terminal/TerminalBackend.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'ShiftOS.Main/Terminal') diff --git a/ShiftOS.Main/Terminal/TerminalBackend.cs b/ShiftOS.Main/Terminal/TerminalBackend.cs index 59e4f27..7904718 100644 --- a/ShiftOS.Main/Terminal/TerminalBackend.cs +++ b/ShiftOS.Main/Terminal/TerminalBackend.cs @@ -30,6 +30,7 @@ namespace ShiftOS.Main.Terminal var theParams = new string[command.Split(' ').Length - 1]; Array.Copy(command.Split(' '), 1, theParams, 0, command.Split(' ').Length - 1); + bool complete = false; foreach (TerminalCommand instance in instances) { if (instance.Name.ToLower() == name.ToLower()) @@ -38,14 +39,17 @@ namespace ShiftOS.Main.Terminal // Add a new line! Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText("\n"); instance.Run(theParams); - return; - } - else - { - Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText($"\nsbash: {command.Split(' ').First()}: invalid command"); + complete = true; return; } } + if(!complete) + { + Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText($"\nsbash: {command.Split(' ').First()}: invalid command"); + return; + } + + Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.Text += " \n The command cannot be found. \n"; } -- cgit v1.2.3