subshell: support user prompt in fallback precmd emulation

Signed-off-by: Yury V. Zaytsev <[email protected]>
MidnightCommander · Jan 15, 2025 · f609f6c · f609f6c
1 parent 0c9a190
commit f609f6c
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/subshell/common.c b/src/subshell/common.c
@@ -1151,20 +1151,23 @@ init_subshell_precmd (char *precmd, size_t buff_size)
      * "PRECMD=precmd; "
      * "PS1='$($PRECMD)$ '\n",
      */
+    /* *INDENT-OFF* */
     static const char *precmd_fallback =
-        " "  /* Useful if the shell supports HISTCONTROL=ignorespace like functionality */
+        " "    /* Useful if the shell supports HISTCONTROL=ignorespace like functionality */
+        "MC_PS1_SAVED=\"$PS1\"; "       /* Save custom PS1 */
         "precmd() { "
-            "if [ ! \"${PWD##$HOME}\" ]; then "
-                "MC_PWD=\"~\"; "
-            "else "
-                "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; "
-            "fi; "
-            "echo \"$USER@$(hostname -s):$MC_PWD\"; "
-            "pwd>&%d; "
-            "kill -STOP $$; "
+        "  if [ ! \"${PWD##$HOME}\" ]; then "
+        "    MC_PWD=\"~\"; "
+        "  else "
+        "    [ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; "
+        "  fi; "
+        "  echo \"${MC_PS1_SAVED:-$USER@$(hostname -s):$MC_PWD\\$ }\"; "
+        "  pwd>&%d; "
+        "  kill -STOP $$; "
         "}; "
         "PRECMD=precmd; "
-        "PS1='$($PRECMD)$ '\n";
+        "PS1='$($PRECMD)'\n";
+    /* *INDENT-ON* */
 
     switch (mc_global.shell->type)
     {