Moving majority functions of apps from TerminalExternalApp into its own separate module and fixing bug on ability to set hostname and username to blank

2 files changed, 16 insertions, 2 deletions

diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Hostname.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Hostname.vb
index 8903069..a436643 100644
--- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Hostname.vb
+++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Hostname.vb
@@ -1,6 +1,13 @@
 Module Com_Hostname
+    Public NewHostname As String
+
     Public Sub Hostname()
-        Strings.ComputerInfo(0) = command.Substring(command.LastIndexOf(" ") + 1, command.Length - (command.LastIndexOf(" ") + 1))
+        NewHostname = command.Substring(command.LastIndexOf(" ") + 1, command.Length - (command.LastIndexOf(" ") + 1))
+        If NewHostname = "" Then
+            NewLine("A hostname should not be blank!")
+        Else
+            Strings.ComputerInfo(0) = NewHostname
+        End If
         Terminal_AssignPrompt()
     End Sub
 End Module
diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Username.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Username.vb
index 0f8b4e7..f3b2423 100644
--- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Username.vb
+++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Username.vb
@@ -1,6 +1,13 @@
 Module Com_Username
+    Public NewUsername As String
+
     Public Sub Username()
-        Strings.ComputerInfo(1) = command.Substring(command.LastIndexOf(" ") + 1, command.Length - (command.LastIndexOf(" ") + 1))
+        NewUsername = command.Substring(command.LastIndexOf(" ") + 1, command.Length - (command.LastIndexOf(" ") + 1))
+        If NewUsername = "" Then
+            NewLine("A username should not be blank")
+        Else
+            Strings.ComputerInfo(1) = NewUsername
+        End If
         Terminal_AssignPrompt()
     End Sub
 End Module