Add fixes for target-shell prompt

And some miscellaneous fixes of typing and consistency

Author: Miauwkeru

dissect/target/tools/shell.py

@@ -21,9 +21,9 @@
 from datetime import datetime, timedelta, timezone
 from typing import Any, BinaryIO, Callable, Iterator, TextIO
 
-from dissect.cstruct import hexdump
 from flow.record import RecordOutput
 
+from dissect.cstruct import hexdump
 from dissect.target.exceptions import (
     PluginError,
     RegistryError,
@@ -304,11 +304,11 @@ def _exec_(argparts: list[str], stdout: TextIO) -> bool:
         no_cyber = cmdfunc.__func__ in (TargetCli.cmd_registry, TargetCli.cmd_enter)
         return self._exec(_exec_, command_args_str, no_cyber)
 
-    def do_man(self, line: str) -> bool:
+    def do_man(self, line: str) -> None:
         """alias for help"""
-        return self.do_help(line)
+        self.do_help(line)
 
-    def complete_man(self, *args) -> list[str]:
+    def complete_man(self, *args: list[str]) -> list[str]:
         return cmd.Cmd.complete_help(self, *args)
 
     def do_unalias(self, line: str) -> bool:
@@ -403,16 +403,14 @@ def __init__(self, target: Target):
             self.histfile = pathlib.Path(getattr(target._config, "HISTFILE", self.DEFAULT_HISTFILE)).expanduser()
 
         # prompt format
+        self.prompt_ps1 = "{BOLD_GREEN}{base}{RESET}:{BOLD_BLUE}{cwd}{RESET}$ "
         if ps1 := getattr(target._config, "PS1", None):
             if "{cwd}" in ps1 and "{base}" in ps1:
                 self.prompt_ps1 = ps1
 
         elif getattr(target._config, "NO_COLOR", None) or os.getenv("NO_COLOR"):
             self.prompt_ps1 = "{base}:{cwd}$ "
 
-        else:
-            self.prompt_ps1 = "{BOLD_GREEN}{base}{RESET}:{BOLD_BLUE}{cwd}{RESET}$ "
-
         super().__init__(self.target.props.get("cyber"))
 
     def _get_targetrc_path(self) -> pathlib.Path: