aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/WindowsFormsApplication1/Apps/Terminal.cs77
-rw-r--r--source/WindowsFormsApplication1/Resources/Credits.txt3
2 files changed, 44 insertions, 36 deletions
diff --git a/source/WindowsFormsApplication1/Apps/Terminal.cs b/source/WindowsFormsApplication1/Apps/Terminal.cs
index 6d4880c..4fb6899 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.cs
+++ b/source/WindowsFormsApplication1/Apps/Terminal.cs
@@ -1615,43 +1615,11 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o
}
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"))
+ if (File.Exists("C:\\ShiftOS\\bin\\" + args[0] + ".exe"))
{
- 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();
+ runExe(args);
}
else
{
@@ -1685,6 +1653,45 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o
#endregion
+ #region RunEXE By Carver Harrison
+ /// <summary>
+ /// RunExe 1.1
+ /// This will run .exe files inside of /bin
+ /// Created By Carver Harrison (@carverh)
+ /// </summary>
+ /// <param name="args">string[] args</param>
+ public void runExe(string[] args)
+ {
+ 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.RedirectStandardInput = 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();
+ }
+ #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