aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Main
diff options
context:
space:
mode:
authorFloppyDiskDrive <[email protected]>2017-11-21 16:28:17 -0600
committerFloppyDiskDrive <[email protected]>2017-11-21 16:28:17 -0600
commitd6359cad3e714d86b1ffd8ed8abe8f6e7e713f41 (patch)
tree9d95413c3c4bc32dd00cc2e7fbd3906415a5b154 /ShiftOS.Main
parentb0cdadf275e2f3642da0a6cac2eabc294d4383c8 (diff)
parentf986e59659601108e64cf3475da99ca7b42c6f37 (diff)
downloadshiftos-rewind-d6359cad3e714d86b1ffd8ed8abe8f6e7e713f41.tar.gz
shiftos-rewind-d6359cad3e714d86b1ffd8ed8abe8f6e7e713f41.tar.bz2
shiftos-rewind-d6359cad3e714d86b1ffd8ed8abe8f6e7e713f41.zip
Merge branch 'master' of https://github.com/ShiftOS-Rewind/ShiftOS
Diffstat (limited to 'ShiftOS.Main')
-rw-r--r--ShiftOS.Main/Terminal/TerminalBackend.cs14
1 files changed, 9 insertions, 5 deletions
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";
}