Allow more bash dialects

Author: skovhus

server/src/util/__tests__/shebang.test.ts

@@ -21,11 +21,14 @@ describe('analyzeShebang', () => {
 
   test.each([
     ['#!/bin/sh -', 'sh'],
-    ['#!/usr/bin/env bash', 'bash'],
     ['#!/bin/sh', 'sh'],
+    ['#!/bin/env sh', 'sh'],
+    ['#!/usr/bin/env bash', 'bash'],
+    ['#!/bin/env bash', 'bash'],
     ['#!/bin/bash', 'bash'],
     ['#!/bin/bash -u', 'bash'],
     ['#! /bin/bash', 'bash'],
+    ['#! /bin/dash', 'dash'],
     ['#!/usr/bin/bash', 'bash'],
   ])('returns a bash dialect for %p', (command, expectedDialect) => {
     expect(analyzeShebang(command).shellDialect).toBe(expectedDialect)

server/src/util/shebang.ts

@@ -1,8 +1,8 @@
 const SHEBANG_REGEXP = /^#!(.*)/
+const SHELL_REGEXP = /bin[/](?:env )?(\w+)/
 
-// TODO: at some point we could let this return all known shells (like dash, ksh, etc)
-// and make the call side decide what to support.
-type SupportedBashDialect = 'bash' | 'sh'
+const BASH_DIALECTS = ['sh', 'bash', 'dash', 'ksh'] as const
+type SupportedBashDialect = typeof BASH_DIALECTS[number]
 
 export function getShebang(fileContent: string): string | null {
   const match = SHEBANG_REGEXP.exec(fileContent)
@@ -14,16 +14,12 @@ export function getShebang(fileContent: string): string | null {
 }
 
 export function getShellDialect(shebang: string): SupportedBashDialect | null {
-  if (shebang.startsWith('/bin/sh') || shebang.startsWith('/usr/bin/env sh')) {
-    return 'sh'
-  }
-
-  if (
-    shebang.startsWith('/bin/bash') ||
-    shebang.startsWith('/usr/bin/bash') ||
-    shebang.startsWith('/usr/bin/env bash')
-  ) {
-    return 'bash'
+  const match = SHELL_REGEXP.exec(shebang)
+  if (match && match[1]) {
+    const bashDialect = match[1].trim() as any
+    if (BASH_DIALECTS.includes(bashDialect)) {
+      return bashDialect
+    }
   }
 
   return null