From 5f096d9f5fe1daaf5f4d7c1ee226091f6bd9ba34 Mon Sep 17 00:00:00 2001 From: Etaash-mathamsetty <45927311+Etaash-mathamsetty@users.noreply.github.com> Date: Sun, 17 Apr 2022 20:46:14 -0400 Subject: [PATCH 1/6] add support for gnome console --- .vscode/configurationCache.log | 1 + app/src/lib/shells/linux.ts | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 .vscode/configurationCache.log diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log new file mode 100644 index 00000000000..618ed811089 --- /dev/null +++ b/.vscode/configurationCache.log @@ -0,0 +1 @@ +{"buildTargets":[],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[]},"fileIndex":[]}} \ No newline at end of file diff --git a/app/src/lib/shells/linux.ts b/app/src/lib/shells/linux.ts index 393e0bb7e30..257a6f37a28 100644 --- a/app/src/lib/shells/linux.ts +++ b/app/src/lib/shells/linux.ts @@ -6,6 +6,7 @@ import { pathExists as pathExistsLinux, spawnShell } from '../helpers/linux' export enum Shell { Gnome = 'GNOME Terminal', + GnomeConsole = "Gnome Console", Mate = 'MATE Terminal', Tilix = 'Tilix', Terminator = 'Terminator', @@ -34,6 +35,8 @@ function getShellPath(shell: Shell): Promise { switch (shell) { case Shell.Gnome: return getPathIfAvailable('/usr/bin/gnome-terminal') + case Shell.GnomeConsole: + return getPathIfAvailable('/usr/bin/kgx') case Shell.Mate: return getPathIfAvailable('/usr/bin/mate-terminal') case Shell.Tilix: @@ -68,6 +71,7 @@ export async function getAvailableShells(): Promise< > { const [ gnomeTerminalPath, + gnomeConsolePath, mateTerminalPath, tilixPath, terminatorPath, @@ -82,6 +86,7 @@ export async function getAvailableShells(): Promise< kittyPath, ] = await Promise.all([ getShellPath(Shell.Gnome), + getShellPath(Shell.GnomeConsole), getShellPath(Shell.Mate), getShellPath(Shell.Tilix), getShellPath(Shell.Terminator), @@ -101,6 +106,10 @@ export async function getAvailableShells(): Promise< shells.push({ shell: Shell.Gnome, path: gnomeTerminalPath }) } + if (gnomeConsolePath) { + shells.push({ shell: Shell.GnomeConsole, path: gnomeConsolePath }) + } + if (mateTerminalPath) { shells.push({ shell: Shell.Mate, path: mateTerminalPath }) } @@ -159,6 +168,7 @@ export function launch( const shell = foundShell.shell switch (shell) { case Shell.Gnome: + case Shell.GnomeConsole: case Shell.Mate: case Shell.Tilix: case Shell.Terminator: From 8e0d515a28d3dfac60d5233f375c54e996ac0d98 Mon Sep 17 00:00:00 2001 From: Etaash-mathamsetty <45927311+Etaash-mathamsetty@users.noreply.github.com> Date: Sun, 17 Apr 2022 20:47:25 -0400 Subject: [PATCH 2/6] Delete configurationCache.log --- .vscode/configurationCache.log | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .vscode/configurationCache.log diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log deleted file mode 100644 index 618ed811089..00000000000 --- a/.vscode/configurationCache.log +++ /dev/null @@ -1 +0,0 @@ -{"buildTargets":[],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[]},"fileIndex":[]}} \ No newline at end of file From acd142a35752547bcf8259ab89aff2ff7a68d032 Mon Sep 17 00:00:00 2001 From: Etaash-mathamsetty <45927311+Etaash-mathamsetty@users.noreply.github.com> Date: Sun, 17 Apr 2022 20:53:37 -0400 Subject: [PATCH 3/6] Update linux.ts --- app/src/lib/shells/linux.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/shells/linux.ts b/app/src/lib/shells/linux.ts index 257a6f37a28..ecd9b68b6eb 100644 --- a/app/src/lib/shells/linux.ts +++ b/app/src/lib/shells/linux.ts @@ -6,7 +6,7 @@ import { pathExists as pathExistsLinux, spawnShell } from '../helpers/linux' export enum Shell { Gnome = 'GNOME Terminal', - GnomeConsole = "Gnome Console", + GnomeConsole = 'Gnome Console', Mate = 'MATE Terminal', Tilix = 'Tilix', Terminator = 'Terminator', From 83880bebb1875d3dcaee3d93faf96327ecbeb18d Mon Sep 17 00:00:00 2001 From: Etaash-mathamsetty <45927311+Etaash-mathamsetty@users.noreply.github.com> Date: Sun, 17 Apr 2022 20:57:38 -0400 Subject: [PATCH 4/6] fix cap of gnome --- app/src/lib/shells/linux.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/lib/shells/linux.ts b/app/src/lib/shells/linux.ts index ecd9b68b6eb..28bdeb898b0 100644 --- a/app/src/lib/shells/linux.ts +++ b/app/src/lib/shells/linux.ts @@ -6,7 +6,7 @@ import { pathExists as pathExistsLinux, spawnShell } from '../helpers/linux' export enum Shell { Gnome = 'GNOME Terminal', - GnomeConsole = 'Gnome Console', + GnomeConsole = 'GNOME Console', Mate = 'MATE Terminal', Tilix = 'Tilix', Terminator = 'Terminator', From 4d4755a617f30cf5800f58831658d8830e9c6406 Mon Sep 17 00:00:00 2001 From: Etaash-mathamsetty <45927311+Etaash-mathamsetty@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:01:07 -0400 Subject: [PATCH 5/6] support new GNOME Text Editor --- app/src/lib/editors/linux.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/lib/editors/linux.ts b/app/src/lib/editors/linux.ts index 5abd1fcca86..4b375ea20f9 100644 --- a/app/src/lib/editors/linux.ts +++ b/app/src/lib/editors/linux.ts @@ -68,9 +68,13 @@ const editors: ILinuxExternalEditor[] = [ paths: ['/usr/bin/kate'], }, { - name: 'GNOME Text Editor', + name: 'GEdit', paths: ['/usr/bin/gedit'], }, + { + name: 'GNOME Text Editor', + paths: ['/usr/bin/gnome-text-editor'], + }, { name: 'Notepadqq', paths: ['/usr/bin/notepadqq'], From 5f38d24b33ed2f06e79637a4e3bdd8b0a1a38fd3 Mon Sep 17 00:00:00 2001 From: Etaash-mathamsetty <45927311+Etaash-mathamsetty@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:11:00 -0400 Subject: [PATCH 6/6] support GNOME builder --- app/src/lib/editors/linux.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/lib/editors/linux.ts b/app/src/lib/editors/linux.ts index 4b375ea20f9..5fec8467e27 100644 --- a/app/src/lib/editors/linux.ts +++ b/app/src/lib/editors/linux.ts @@ -75,6 +75,10 @@ const editors: ILinuxExternalEditor[] = [ name: 'GNOME Text Editor', paths: ['/usr/bin/gnome-text-editor'], }, + { + name: 'GNOME Builder', + paths: ['/usr/bin/gnome-builder'], + }, { name: 'Notepadqq', paths: ['/usr/bin/notepadqq'],