fix condition regression introduced by previous linux console change

bash-color-prompt was mistakenly always enable on linux console

Also rename $prompt_color_force to $bash_prompt_color_force
This commit is contained in:
Jens Petersen 2024-06-07 20:24:07 +08:00
parent 1dd8c6c16d
commit 2773bff058

View File

@ -4,7 +4,7 @@
# PROMPT_DIRTRIM=3
# only set for color terminals and if PS1 unchanged from bash or fedora defaults
if [ '(' "$PS1" = "[\u@\h \W]\\$ " -o "$PS1" = "\\s-\\v\\\$ " ')' -a "${TERM: -5}" = "color" -o "${TERM}" = "linux" -o -n "${prompt_color_force}" ]; then
if [ '(' "$PS1" = "[\u@\h \W]\\$ " -o "$PS1" = "\\s-\\v\\\$ " ')' -a '(' "${TERM: -5}" = "color" -o "${TERM}" = "linux" ')' -o -n "${bash_prompt_color_force}" ]; then
PROMPT_COLOR="${PROMPT_COLOR:-32}"
PROMPT_USERHOST="${PROMPT_USERHOST:-\u@\h}"