images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-07-17 04:59:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
David Refoua
2025-07-15 19:31:41 +03:30
committed by GitHub
parent aa156a2901
commit 76c5b9e116
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
vendor/git-prompt.sh vendored
View File

@ -20,7 +20,7 @@ function getSimpleGitBranch() {
then then
echo " (${headContent:16})" echo " (${headContent:16})"
else else
echo " (HEAD detached at ${headContent:0:7})" echo " (HEAD detached at ${headContent:0:7})"
fi fi
} }
@ -38,12 +38,12 @@ then
. ~/.config/git/git-prompt.sh . ~/.config/git/git-prompt.sh
fi fi
else else
PS1='\[\033]0;$TITLEPREFIX:$PWD\007\]' # set window title # Taken from https://github.com/git-for-windows/build-extra/blob/main/git-extra/git-prompt.sh
# PS1="$PS1"'\n' # new line PS1='\[\033]0;$TITLEPREFIX:${PWD//[^[:ascii:]]/?}\007\]' # set window title
# PS1="$PS1"'\n' # new line (disabled)
PS1="$PS1"'\[\033[32m\]' # change to green PS1="$PS1"'\[\033[32m\]' # change to green
PS1="$PS1"'\u@\h ' # user@host<space> PS1="$PS1"'\u@\h ' # user@host<space>
# PS1="$PS1"'\[\033[35m\]' # change to purple PS1="$PS1${MSYSTEM:+\[\033[35m\]$MSYSTEM }" # show MSYSTEM in purple (if set)
# PS1="$PS1"'$MSYSTEM ' # show MSYSTEM
PS1="$PS1"'\[\033[33m\]' # change to brownish yellow PS1="$PS1"'\[\033[33m\]' # change to brownish yellow
PS1="$PS1"'\w' # current working directory PS1="$PS1"'\w' # current working directory
if test -z "$WINELOADERNOEXEC" if test -z "$WINELOADERNOEXEC"
@ -68,7 +68,7 @@ else
fi fi
PS1="$PS1"'\[\033[0m\]' # change color PS1="$PS1"'\[\033[0m\]' # change color
PS1="$PS1"'\n' # new line PS1="$PS1"'\n' # new line
PS1="$PS1"'λ ' # prompt: always λ PS1="$PS1"'λ ' # prompt: Cmder uses λ
fi fi
MSYS2_PS1="$PS1" # for detection by MSYS2 SDK's bash.basrc MSYS2_PS1="$PS1" # for detection by MSYS2 SDK's bash.basrc
@ -76,10 +76,10 @@ MSYS2_PS1="$PS1" # for detection by MSYS2 SDK's bash.basrc
# Evaluate all user-specific Bash completion scripts (if any) # Evaluate all user-specific Bash completion scripts (if any)
if test -z "$WINELOADERNOEXEC" if test -z "$WINELOADERNOEXEC"
then then
for c in "$HOME"/bash_completion.d/*.bash for c in "$HOME"/bash_completion.d/*.bash
do do
# Handle absence of any scripts (or the folder) gracefully # Handle absence of any scripts (or the folder) gracefully
test ! -f "$c" || test ! -f "$c" ||
. "$c" . "$c"
done done
fi fi