Changing from all uses Console.BadCommand = False to just one NormalCommand() Sub

4 files changed, 36 insertions, 36 deletions

diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Date.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Date.vb
index 81f0822..5e3a794 100644
--- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Date.vb
+++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Date.vb
@@ -3,33 +3,33 @@
         If Strings.AvailableFeature(24) = 1 Then
             NewLine("The date is " & Date.Now.DayOfYear & " days since the first day of the year")
             AdvancedCommand = False
-            Console.BadCommand = False
+            NormalCommand()
         ElseIf Strings.AvailableFeature(24) = 3 Then
             If Strings.AvailableFeature(25) = 1 Then
                 Dim TheWeek As String = Date.Now.DayOfYear / 7
                 NewLine("The date is " & TheWeek.Substring(0, 2) & " weeks since the first week of the year")
                 AdvancedCommand = False
-                Console.BadCommand = False
+                NormalCommand()
             ElseIf Strings.AvailableFeature(25) = 3 Then
                 If Strings.AvailableFeature(26) = 1 Then
                     NewLine("The date is " & Date.Now.Month & " months since the first month of the year")
                     AdvancedCommand = False
-                    Console.BadCommand = False
+                    NormalCommand()
                 ElseIf Strings.AvailableFeature(26) = 3 Then
                     If Strings.AvailableFeature(27) = 1 Then
                         NewLine("The year is " & Date.Now.Year)
                         AdvancedCommand = False
-                        Console.BadCommand = False
+                        NormalCommand()
                     ElseIf Strings.AvailableFeature(27) = 3 Then
                         If Strings.AvailableFeature(28) = 1 Then
                             NewLine("The date is " & Date.Now.Day & "/" & Date.Now.Month)
                             AdvancedCommand = False
-                            Console.BadCommand = False
+                            NormalCommand()
                         ElseIf Strings.AvailableFeature(28) = 3 Then
                             If Strings.AvailableFeature(29) = 1 Then
                                 NewLine("The date is " & Date.Now.Day & "/" & Date.Now.Month & "/" & Date.Now.Year)
                                 AdvancedCommand = False
-                                Console.BadCommand = False
+                                NormalCommand()
                             End If
                         End If
                     End If
diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Infobar.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Infobar.vb
index c067125..286e544 100644
--- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Infobar.vb
+++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Infobar.vb
@@ -7,18 +7,18 @@
             Case "on"
                 Strings.OnceInfo(2) = "True"
                 Console.CheckFeature()
-                Console.BadCommand = False
+                NormalCommand()
                 advancedtool = False
             Case "off"
                 Strings.OnceInfo(2) = "False"
                 Console.CheckFeature()
-                Console.BadCommand = False
+                NormalCommand()
                 advancedtool = False
         End Select
         If advancedtool = True Then
             If infobarcommand Like "color *" Then
                 GetColor("infobar", infobarcommand.Substring(6, 1), infobarcommand.Substring(7, 1))
-                Console.BadCommand = False
+                NormalCommand()
             End If
         End If
     End Sub
diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Manual.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Manual.vb
index a3c7de9..3ba13f5 100644
--- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Manual.vb
+++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Manual.vb
@@ -19,140 +19,140 @@
                 If Strings.AvailableFeature(9) = "1" Then
                     TempUsage = TempUsage & "bc"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_bc & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "cd"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "cd [DIRECTORY]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_cd & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "clear"
                 If Strings.AvailableFeature(1) = "1" Then
                     TempUsage = TempUsage & "clear"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_clear & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "color"
                 TempUsage = TempUsage & "color [bg][fg]"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_color & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case "colors"
                 TempUsage = TempUsage & "colors"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_colors & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case "cowsay"
                 If Strings.AvailableFeature(22) = 1 Then
                     TempUsage = TempUsage & "cowsay [STRING]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_cowsay & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "codepoint"
                 TempUsage = TempUsage & "codepoint"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_codepoint & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case "del"
                 If Strings.AvailableFeature(16) = 1 Then
                     TempUsage = TempUsage & "del [FILENAME.TXT]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_del & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "dir"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "dir"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_dir & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "guess"
                 TempUsage = TempUsage & "guess"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_guess & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case "help"
                 TempUsage = TempUsage & "help"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_help & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case "hostname"
                 If Strings.AvailableFeature(20) = 1 Then
                     TempUsage = TempUsage & "hostname [HOSTNAME]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_hostname & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "infobar"
                 If Strings.AvailableFeature(4) = 1 Then
                     TempUsage = TempUsage & "infobar [ON|OFF] [OPTION]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_infobar & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "man"
                 If Strings.AvailableFeature(0) = "1" Then
                     TempUsage = TempUsage & "man [command]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_man & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "mkdir"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "mkdir [DIRECTORY]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_mkdir & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "print"
                 If Strings.AvailableFeature(2) = "1" Then
                     TempUsage = TempUsage & "print [text]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_print & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "pwd"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "pwd"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_pwd & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "reboot"
                 TempUsage = TempUsage & "reboot"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_reboot & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case "rmdir"
                 If Strings.AvailableFeature(16) = "1" Then
                     TempUsage = TempUsage & "rmdir [DIRECTORY]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_rmdir & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "shiftfetch"
                 If Strings.AvailableFeature(8) = "1" Then
                     TempUsage = TempUsage & "shiftfetch"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shiftfetch & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "shiftorium"
                 TempUsage = TempUsage & "shiftorium [option] [featureName]"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shiftorium & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case "shutdown"
                 TempUsage = TempUsage & "shutdown"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_shutdown & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case "textpad"
                 If Strings.AvailableFeature(17) = "1" Then
                     TempUsage = TempUsage & "textpad [FILENAME.TXT]"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_textpad & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "time"
                 If Strings.AvailableFeature(17) = "1" Then
                     TempUsage = TempUsage & "time"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_time & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "username"
                 If Strings.AvailableFeature(19) = "1" Then
                     TempUsage = TempUsage & "username"
                     Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_username & Environment.NewLine
-                    Console.BadCommand = False
+                    NormalCommand()
                 End If
             Case "ver"
                 TempUsage = TempUsage & "ver"
                 Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_ver & Environment.NewLine
-                Console.BadCommand = False
+                NormalCommand()
             Case Else
                 NewLine("MAN : Invalid command")
         End Select
diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftorium.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftorium.vb
index 47fecd1..349f2bc 100644
--- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftorium.vb
+++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftorium.vb
@@ -12,7 +12,7 @@
         End If
         If prompt = "list" Then
             Shiftorium_ListFeatures()
-            Console.BadCommand = False
+            NormalCommand()
         End If
     End Sub
 End Module