Support user prompt in fallback precmd emulation

MidnightCommander · Jan 12, 2025 · 9d4bbe5 · 9d4bbe5
1 parent dcc71b5
commit 9d4bbe5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/subshell/common.c b/src/subshell/common.c
@@ -1153,18 +1153,19 @@ init_subshell_precmd (char *precmd, size_t buff_size)
      */
     static const char *precmd_fallback =
         " "  /* 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\"; "
+            "echo \"${MC_PS1_SAVED:-$USER@$(hostname -s):$MC_PWD\\$ }\"; "
             "pwd>&%d; "
             "kill -STOP $$; "
         "}; "
         "PRECMD=precmd; "
-        "PS1='$($PRECMD)$ '\n";
+        "PS1='$($PRECMD)'\n";
 
     switch (mc_global.shell->type)
     {