From abec077f23768a02cc66317024ad96251bc8ef61 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Wed, 3 May 2023 15:02:58 +0200 Subject: [PATCH] Fixed wrong path when opening terminal in macos --- .../jetpackduba/gitnuro/terminal/MacTerminalProvider.kt | 8 +++----- .../gitnuro/terminal/WindowsTerminalProvider.kt | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/terminal/MacTerminalProvider.kt b/src/main/kotlin/com/jetpackduba/gitnuro/terminal/MacTerminalProvider.kt index 132f590..1546b6e 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/terminal/MacTerminalProvider.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/terminal/MacTerminalProvider.kt @@ -4,7 +4,6 @@ package com.jetpackduba.gitnuro.terminal import com.jetpackduba.gitnuro.managers.IShellManager import javax.inject.Inject -// TODO Test this on MacOS class MacTerminalProvider @Inject constructor( private val shellManager: IShellManager ) : ITerminalProvider { @@ -15,12 +14,11 @@ class MacTerminalProvider @Inject constructor( } override fun isTerminalInstalled(terminalEmulator: TerminalEmulator): Boolean { - val checkTerminalInstalled = shellManager.runCommand(listOf("which", terminalEmulator.path, "2>/dev/null")) - - return !checkTerminalInstalled.isNullOrEmpty() + return true // TODO Return true always until we support multiple terminals } override fun startTerminal(terminalEmulator: TerminalEmulator, repositoryPath: String) { - shellManager.runCommandInPath(listOf("open", "-a", terminalEmulator.path), repositoryPath) + // TODO Check if passing the path as argument is required for other terminal emulators + shellManager.runCommandInPath(listOf("open", "-a", terminalEmulator.path, "--args", repositoryPath), repositoryPath) } } \ No newline at end of file diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/terminal/WindowsTerminalProvider.kt b/src/main/kotlin/com/jetpackduba/gitnuro/terminal/WindowsTerminalProvider.kt index cc528b1..470b5f0 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/terminal/WindowsTerminalProvider.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/terminal/WindowsTerminalProvider.kt @@ -8,6 +8,7 @@ class WindowsTerminalProvider @Inject constructor( ) : ITerminalProvider { override fun getTerminalEmulators(): List { return listOf( + // TODO powershell is the only terminal emulator supported until we add support for custom TerminalEmulator("Powershell", "powershell.exe"), ) }