subshells and shell-specific cmds

2 files changed, 17 insertions, 23 deletions

diff --git a/ShiftOS.Frontend/Apps/Terminal.cs b/ShiftOS.Frontend/Apps/Terminal.cs
index 343bb5d..0621139 100644
--- a/ShiftOS.Frontend/Apps/Terminal.cs
+++ b/ShiftOS.Frontend/Apps/Terminal.cs
@@ -199,7 +199,7 @@ namespace ShiftOS.Frontend.Apps
 
         protected override void OnKeyEvent(KeyEvent a)
         {
-            if(a.ControlDown && (a.Key == Keys.OemPlus || a.Key == Keys.Add))
+            if (a.ControlDown && (a.Key == Keys.OemPlus || a.Key == Keys.Add))
             {
                 _zoomFactor *= 2;
                 RecalculateLayout();
@@ -209,7 +209,7 @@ namespace ShiftOS.Frontend.Apps
 
             if (a.ControlDown && (a.Key == Keys.OemMinus || a.Key == Keys.Subtract))
             {
-                _zoomFactor = Math.Max(1, _zoomFactor/2);
+                _zoomFactor = Math.Max(1, _zoomFactor / 2);
                 RecalculateLayout();
                 Invalidate();
                 return;
@@ -221,7 +221,7 @@ namespace ShiftOS.Frontend.Apps
                 if (!PerformTerminalBehaviours)
                 {
                     Text = Text.Insert(Index, Environment.NewLine);
-                    Index+=2;
+                    Index += 2;
                     RecalculateLayout();
                     Invalidate();
                     return;
@@ -239,12 +239,12 @@ namespace ShiftOS.Frontend.Apps
                     var text2 = text[text.Length - 1];
                     var text3 = "";
                     var text4 = Regex.Replace(text2, @"\t|\n|\r", "");
-                        WriteLine("");
+                    WriteLine("");
 
-                        if (TerminalBackend.PrefixEnabled)
-                        {
-                            text3 = text4.Remove(0, $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
-                        }
+                    if (TerminalBackend.PrefixEnabled)
+                    {
+                        text3 = text4.Remove(0, TerminalBackend.ShellOverride.Length);
+                    }
                     if (!string.IsNullOrWhiteSpace(text3))
                     {
                         TerminalBackend.LastCommand = text3;
@@ -288,7 +288,7 @@ namespace ShiftOS.Frontend.Apps
                     {
                         var tostring3 = Lines[Lines.Length - 1];
                         var tostringlen = tostring3.Length + 1;
-                        var workaround = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
+                        var workaround = TerminalBackend.ShellOverride;
                         var derp = workaround.Length + 1;
                         if (tostringlen != derp)
                         {
@@ -310,9 +310,9 @@ namespace ShiftOS.Frontend.Apps
                     Debug.WriteLine("Drunky alert in terminal.");
                 }
             }
-            else if(a.Key == Keys.Right)
+            else if (a.Key == Keys.Right)
             {
-                if(Index < Text.Length)
+                if (Index < Text.Length)
                 {
                     Index++;
                     AppearanceManager.CurrentPosition++;
@@ -326,7 +326,7 @@ namespace ShiftOS.Frontend.Apps
                 {
                     var getstring = Lines[Lines.Length - 1];
                     var stringlen = getstring.Length + 1;
-                    var header = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
+                    var header = TerminalBackend.ShellOverride;
                     var headerlen = header.Length + 1;
                     var selstart = Index;
                     var remstrlen = Text.Length - stringlen;
@@ -343,7 +343,7 @@ namespace ShiftOS.Frontend.Apps
             else if (a.Key == Keys.Up && PerformTerminalBehaviours)
             {
                 var tostring3 = Lines[Lines.Length - 1];
-                if (tostring3 == $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
+                if (tostring3 == TerminalBackend.ShellOverride)
                     Console.Write(TerminalBackend.LastCommand);
                 ConsoleEx.OnFlush?.Invoke();
                 return;
@@ -360,7 +360,7 @@ namespace ShiftOS.Frontend.Apps
                     Text = Text.Insert(Index, a.KeyChar.ToString());
                     Index++;
                     AppearanceManager.CurrentPosition++;
-//                    RecalculateLayout();
+                    //                    RecalculateLayout();
                     InvalidateTopLevel();
                 }
             }
diff --git a/ShiftOS.Frontend/Commands.cs b/ShiftOS.Frontend/Commands.cs
index 012d0b0..d21e8a9 100644
--- a/ShiftOS.Frontend/Commands.cs
+++ b/ShiftOS.Frontend/Commands.cs
@@ -152,7 +152,8 @@ namespace ShiftOS.Frontend
             }
         }
 
-        [Command("commands", "", "{DESC_COMMANDS}")]
+        [MetaCommand]
+        [Command("help", "", "{DESC_COMMANDS}")]
         public static bool Commands()
         {
             var sb = new StringBuilder();
@@ -160,7 +161,7 @@ namespace ShiftOS.Frontend
             sb.AppendLine("=================");
             sb.AppendLine();
             //print all unique namespaces.
-            foreach (var n in TerminalBackend.Commands.Where(x => !(x is TerminalBackend.WinOpenCommand) && Shiftorium.UpgradeInstalled(x.Dependencies) && x.CommandInfo.hide == false).OrderBy(x => x.CommandInfo.name))
+            foreach (var n in TerminalBackend.Commands.Where(x => !(x is TerminalBackend.WinOpenCommand) && Shiftorium.UpgradeInstalled(x.Dependencies) && x.CommandInfo.hide == false && x.MatchShell() == true).OrderBy(x => x.CommandInfo.name))
             {
                 sb.Append(" - " + n.CommandInfo.name);
                 if (!string.IsNullOrWhiteSpace(n.CommandInfo.description))
@@ -174,13 +175,6 @@ namespace ShiftOS.Frontend
             return true;
         }
 
-        [Command("help", description = "{DESC_HELP}")]
-        public static bool Help()
-        {
-            Commands();
-            WindowCommands.Programs();
-            return true;
-        }
 
 
         [MultiplayerOnly]