fix: idle state and shell icons

Author: CyanSalt

src/main/index.ts

@@ -70,7 +70,7 @@ app.on('will-finish-launching', () => {
 })
 
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
+  if (process.platform !== 'darwin' || !app.isPackaged) {
     app.quit()
   }
 })

src/renderer/assets/icons.ts

@@ -5,17 +5,28 @@ export interface IconEntry {
 }
 
 export default [
+  {
+    name: 'simple-icons-gnubash',
+    patterns: ['bash'],
+    color: '#4eaa25',
+  },
   {
     name: 'simple-icons-bun',
     patterns: ['bun', 'bunx'],
   },
+  {
+    name: 'simple-icons-dash',
+    patterns: ['dash'],
+    color: '#008de4',
+  },
   {
     name: 'simple-icons-curl',
     patterns: ['curl'],
   },
   {
     name: 'simple-icons-deno',
     patterns: ['deno'],
+    color: '#70ffaf',
   },
   {
     name: 'simple-icons-docker',
@@ -30,7 +41,7 @@ export default [
   {
     name: 'simple-icons-nodedotjs',
     patterns: ['node'],
-    color: '#339933',
+    color: '#5fa04e',
   },
   {
     name: 'simple-icons-rust',
@@ -56,4 +67,9 @@ export default [
     patterns: ['nvim'],
     color: '#57a143',
   },
+  {
+    name: 'simple-icons-zsh',
+    patterns: ['zsh'],
+    color: '#f15a24',
+  },
 ] as (IconEntry & { patterns: NonNullable<IconEntry['patterns']> })[]

src/renderer/components/TabItem.vue

@@ -4,7 +4,7 @@ import type { TerminalTab, TerminalTabCharacter } from '@commas/types/terminal'
 import type { IconEntry } from '../assets/icons'
 import { useSettings } from '../compositions/settings'
 import { closeTerminalTab, getTerminalTabTitle, useCurrentTerminal } from '../compositions/terminal'
-import { getIconEntry } from '../utils/terminal'
+import { getIconEntry, isShellProcess } from '../utils/terminal'
 import VisualIcon from './basic/VisualIcon.vue'
 
 const { tab, character, closable = false, customizable = false } = defineProps<{
@@ -112,7 +112,7 @@ const idleState = $computed(() => {
   if (typeof tab.idle === 'boolean') return tab.idle ? 'idle' : 'busy'
   if (tab.command === '') return 'idle'
   if (pane) return ''
-  if (tab.process === tab.shell) return 'idle'
+  if (isShellProcess(tab)) return 'idle'
   return 'busy'
 })
 

src/renderer/utils/terminal.ts

@@ -9,8 +9,14 @@ import icons from '../assets/icons'
 
 export const TERMINAL_DIRECTORY_SHELL = '/'
 
+export function isShellProcess(tab: TerminalTab) {
+  return tab.process === (
+    path.isAbsolute(tab.process) ? tab.shell : path.basename(tab.shell)
+  )
+}
+
 export function getProcessName(tab: TerminalTab) {
-  if (tab.process === tab.shell) {
+  if (isShellProcess(tab)) {
     if (tab.command) {
       const entries = parse(tab.command)
       const command = entries.find((item): item is string => typeof item === 'string')
@@ -42,6 +48,7 @@ export function getPrompt(expr: string, tab: TerminalTab | null) {
 }
 
 export function getIconEntry(tab: TerminalTab) {
+  if (isShellProcess(tab)) return undefined
   let name = getProcessName(tab).toLowerCase()
   const ext = path.extname(name)
   // strip '.exe' extname in process name (Windows only)