try fix shell detection

Author: bckohan

.github/workflows/test.yml

@@ -443,6 +443,7 @@ jobs:
       shell: fish {0}
       run: |
         poetry run python -c "from shellingham import detect_shell; print(detect_shell())"
+        echo $SHELL
         just test-fish || exit 1
 
     - name: Store coverage files

django_typer/management/commands/shellcompletion.py

@@ -42,14 +42,14 @@
 from django.utils.module_loading import import_string
 from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
-from shellingham import ShellDetectionFailure, detect_shell
+from shellingham import ShellDetectionFailure
 from typer import Argument, Option
 from typer.main import get_command as get_typer_command
 
 from django_typer.completers import complete_import_path, these_strings
 from django_typer.management import TyperCommand, command, get_command, initialize
 from django_typer.types import COMMON_PANEL
-from django_typer.utils import get_usage_script, get_win_shell
+from django_typer.utils import detect_shell, get_usage_script, get_win_shell
 
 DETECTED_SHELL = None
 

django_typer/utils.py

@@ -14,11 +14,15 @@
 from threading import local
 from types import MethodType, ModuleType
 
+from shellingham import ShellDetectionFailure
+from shellingham import detect_shell as _detect_shell
+
 from .config import traceback_config
 
 # DO NOT IMPORT ANYTHING FROM TYPER HERE - SEE patch.py
 
 __all__ = [
+    "detect_shell",
     "get_usage_script",
     "traceback_config",
     "get_current_command",
@@ -29,6 +33,22 @@
 ]
 
 
+def detect_shell(max_depth: int = 10) -> t.Tuple[str, str]:
+    """
+    Detect the current shell.
+
+    :raises ShellDetectionFailure: If the shell cannot be detected
+    :return: A tuple of the shell name and the shell command
+    """
+    try:
+        return _detect_shell(max_depth=max_depth)
+    except ShellDetectionFailure:
+        login_shell = os.environ.get("SHELL", "")
+        if login_shell:
+            return (os.path.basename(login_shell).lower(), login_shell)
+        raise
+
+
 def get_usage_script(script: t.Optional[str] = None) -> t.Union[Path, str]:
     """
     Return the script name if it is on the path or the absolute path to the script

tests/shellcompletion/__init__.py

@@ -13,7 +13,7 @@
 import subprocess
 import platform
 
-from shellingham import detect_shell
+from django_typer.utils import detect_shell
 
 from django.test import TestCase, override_settings
 from django_typer.management import get_command

tests/shellcompletion/test_shell_resolution.py

@@ -6,8 +6,8 @@
 
 from django_typer.management import get_command
 from django_typer.management.commands.shellcompletion import Command as ShellComplete
-from shellingham import detect_shell, ShellDetectionFailure
-from django_typer.utils import get_win_shell
+from shellingham import ShellDetectionFailure
+from django_typer.utils import get_win_shell, detect_shell
 
 
 def test_detect_shell():