diff --git a/source/WindowsFormsApplication1/Apps/Terminal.cs b/source/WindowsFormsApplication1/Apps/Terminal.cs
index 6d4880c..7c0c78b 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.cs
+++ b/source/WindowsFormsApplication1/Apps/Terminal.cs
@@ -1561,6 +1561,15 @@ public void cmd_echo(String[] args)
}
}
+ public void cmd_bash(String[] args)
+ {
+ Process p = new Process();
+ p.StartInfo.FileName = "powershell";
+ p.StartInfo.Arguments = "C:\\ShiftOS\\bin\\bash.exe";
+ p.StartInfo.WorkingDirectory = current_dir;
+ p.Start();
+ }
+
public void cmd_default(String[] args)
{
if (API.OpenProgram(args[0]) == false)
@@ -1615,48 +1624,13 @@ public void cmd_default(String[] args)
}
if (done == false)
{
- // This runs LUA and EXE Applications
+ // This runs EXE Applications like Core Utils
// Created By Carver Harrison (@carverh)
- if (File.Exists("C:\\ShiftOS\\LuaApps\\" + args[0] + ".lua"))
- {
- string lp = "C:\\ShiftOS\\LuaApps\\" + args[0] + ".lua";
- WriteLine(lp);
- var l = new LuaInterpreter(lp);
- }
- else if (File.Exists("C:\\ShiftOS\\bin\\" + args[0] + ".exe"))
- {
- bool isFirstArg = true;
- string exeArgs = "";
- foreach (string arg in args)
- {
- if (!isFirstArg)
- {
- exeArgs = exeArgs + " " + arg;
- }
- else
- {
- isFirstArg = false;
- }
- }
- string lp = "C:\\ShiftOS\\bin\\" + args[0] + ".exe";
- Process p = new Process();
- p.StartInfo.Arguments = exeArgs;
- p.StartInfo.UseShellExecute = false;
- p.StartInfo.RedirectStandardOutput = true;
- p.StartInfo.FileName = lp;
- p.StartInfo.CreateNoWindow = true;
- p.StartInfo.ErrorDialog = false;
- p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
- p.StartInfo.WorkingDirectory = current_dir;
- p.Start();
-
- WriteLine(p.StandardOutput.ReadToEnd());
- p.WaitForExit();
- }
- else
- {
- wrongcommand();
- }
+ wrongcommand();
+ }
+ else
+ {
+ wrongcommand();
}
}
}
@@ -1685,6 +1659,16 @@ public void cmd_histacom_timedistorter(String[] args)
#endregion
+ #region RunEXE By Carver Harrison
+ ///
+ /// RunExe 1.1
+ /// This will run .exe files inside of /bin
+ /// Created By Carver Harrison (@carverh)
+ ///
+ /// string[] args
+
+ #endregion
+
private void StartChoice1EndStory()
{
var t = new System.Windows.Forms.Timer();
diff --git a/source/WindowsFormsApplication1/Resources/Credits.txt b/source/WindowsFormsApplication1/Resources/Credits.txt
index 2bc1e2a..3a75728 100644
--- a/source/WindowsFormsApplication1/Resources/Credits.txt
+++ b/source/WindowsFormsApplication1/Resources/Credits.txt
@@ -3,9 +3,10 @@ ShiftOS #VER#
== Developers ==
Michael VanOverbeek
Philip Adams
+Carver Harrison
+William
GabrielTK
PCSource
-Carver Harrison
AShifter