Remove GitModule.RunBash()

gitextensions · Jul 9, 2020 · 4b3609f · 4b3609f
1 parent 95432ac
commit 4b3609f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 96 deletions.
diff --git a/GitCommands/Git/GitModule.cs b/GitCommands/Git/GitModule.cs
@@ -920,69 +920,6 @@ public void RunMergeTool([CanBeNull] string fileName = "")
             }
         }
 
-        /// <summary>Runs a bash or shell command.</summary>
-        [CanBeNull]
-        public IProcess RunBash(string bashCommand = null)
-        {
-            if (EnvUtils.RunningOnUnix())
-            {
-                string[] termEmuCommands =
-                {
-                    "gnome-terminal",
-                    "konsole",
-                    "Terminal",
-                    "xterm"
-                };
-
-                var which = new Executable("which");
-                var cmd = termEmuCommands.FirstOrDefault(
-                    termEmuCmd => !string.IsNullOrEmpty(which.GetOutput(termEmuCmd)));
-                var args = "";
-
-                if (string.IsNullOrEmpty(cmd))
-                {
-                    cmd = "bash";
-                    args = "--login -i";
-                }
-
-                return new Executable(cmd, WorkingDir).Start(args, createWindow: true);
-            }
-            else
-            {
-                if (PathUtil.TryFindShellPath("git-bash.exe", out var shellPath))
-                {
-                    return new Executable(shellPath, WorkingDir).Start(createWindow: true);
-                }
-
-                string args;
-                if (string.IsNullOrWhiteSpace(bashCommand))
-                {
-                    args = "--login -i\"";
-                }
-                else
-                {
-                    args = "--login -i -c \"" + bashCommand.Replace("\"", "\\\"") + "\"";
-                }
-
-                args = "/c \"\"{0}\" " + args;
-
-                if (PathUtil.TryFindShellPath("bash.exe", out shellPath))
-                {
-                    return new Executable("cmd.exe", WorkingDir)
-                        .Start(string.Format(args, shellPath), createWindow: true);
-                }
-
-                if (PathUtil.TryFindShellPath("sh.exe", out shellPath))
-                {
-                    return new Executable("cmd.exe", WorkingDir)
-                        .Start(string.Format(args, shellPath), createWindow: true);
-                }
-
-                return new Executable("cmd.exe", WorkingDir)
-                    .Start(@"/K echo git bash command not found! :( Please add a folder containing 'bash.exe' to your PATH...", createWindow: true);
-            }
-        }
-
         public string Init(bool bare, bool shared)
         {
             var args = new GitArgumentBuilder("init")

diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -2181,7 +2181,7 @@ protected override CommandStatus ExecuteCommand(int cmd)
         {
             switch ((Command)cmd)
             {
-                case Command.GitBash: Module.RunBash(); break;
+                case Command.GitBash: userShell.PerformButtonClick(); break;
                 case Command.GitGui: Module.RunGui(); break;
                 case Command.GitGitK: Module.RunGitK(); break;
                 case Command.FocusBranchTree: FocusBranchTree(); break;

diff --git a/GitUI/CommandsDialogs/FormCommandlineHelp.resx b/GitUI/CommandsDialogs/FormCommandlineHelp.resx
@@ -137,7 +137,6 @@ difftool filename
 filehistory filename
 fileeditor filename
 formatpatch
-gitbash
 gitignore
 help (shows this dialog)
 init [path]

diff --git a/GitUI/GitUICommands.cs b/GitUI/GitUICommands.cs
@@ -1484,8 +1484,6 @@ private bool RunCommandBasedOnArgument(IReadOnlyList<string> args, IReadOnlyDict
                     return StartFileEditorDialog(args[2]);
                 case "formatpatch":
                     return StartFormatPatchDialog();
-                case "gitbash":
-                    return Module.RunBash() != null;
                 case "gitignore":
                     return StartEditGitIgnoreDialog(null, false);
                 case "init":        // [path]

diff --git a/IntegrationTests/UI.IntegrationTests/GitUICommands/RunCommandTests.cs b/IntegrationTests/UI.IntegrationTests/GitUICommands/RunCommandTests.cs
@@ -225,35 +225,6 @@ public void RunCommandBasedOnArgument_fileeditor()
         public void RunCommandBasedOnArgument_formatpatch()
             => RunCommandBasedOnArgument<FormFormatPatch>(new string[] { "ge.exe", "formatpatch" });
 
-        [Test]
-        public void RunCommandBasedOnArgument_gitbash()
-        {
-            _commands.GetTestAccessor().RunCommandBasedOnArgument(new string[] { "ge.exe", "gitbash" }).Should().BeTrue();
-
-            // wait for the shell to be started
-            Thread.Sleep(5000);
-
-            // find and kill the started shell executable
-            var currentProcessId = Process.GetCurrentProcess().Id;
-            int numberOfShellChildren = KillChildProcess("git-bash") + KillChildProcess("cmd");
-            numberOfShellChildren.Should().Be(1);
-
-            return;
-
-            int KillChildProcess(string name)
-            {
-                int number = 0;
-                Process.GetProcessesByName(name)
-                    .Where(process => process.ParentProcess()?.Id == currentProcessId)
-                    .ForEach(process =>
-                    {
-                        process.TerminateTree();
-                        ++number;
-                    });
-                return number;
-            }
-        }
-
         [Test]
         public void RunCommandBasedOnArgument_gitignore()
             => RunCommandBasedOnArgument<FormGitIgnore>(new string[] { "ge.exe", "gitignore" });