Fix COMMAND_PROMPT for interactive non-login shells