images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-13 03:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow git prompt status opt out for powershell and bash

Browse Source
This commit is contained in:
Dax T. Games 2019-11-09 16:36:16 -05:00
parent 44bc089ee4
commit 3ee244e4c1
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vendor/git-prompt.sh vendored
View File

@ -1,3 +1,14 @@
function getGitStatusSetting() {
gitStatusSetting=$(git config cmder.status 2>/dev/null)
if [[ -n ${gitStatusSetting} ]] && [[ ${gitStatusSetting} == false ]]
then
echo false
else
echo true
fi
}
if test -f /etc/profile.d/git-sdk.sh if test -f /etc/profile.d/git-sdk.sh
then then
TITLEPREFIX=SDK-${MSYSTEM#MINGW} TITLEPREFIX=SDK-${MSYSTEM#MINGW}
@ -7,7 +18,10 @@ fi
if test -f ~/.config/git/git-prompt.sh if test -f ~/.config/git/git-prompt.sh
then then
. ~/.config/git/git-prompt.sh if [[ $(getGitStatusSetting) == true ]]
then
. ~/.config/git/git-prompt.sh
fi
else else
PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
# PS1="$PS1"'\n' # new line # PS1="$PS1"'\n' # new line
@ -26,9 +40,12 @@ else
if test -f "$COMPLETION_PATH/git-prompt.sh" if test -f "$COMPLETION_PATH/git-prompt.sh"
then then
. "$COMPLETION_PATH/git-completion.bash" . "$COMPLETION_PATH/git-completion.bash"
. "$COMPLETION_PATH/git-prompt.sh" if [[ $(getGitStatusSetting) == true ]]
PS1="$PS1"'\[\033[36m\]' # change color to cyan then
PS1="$PS1"'`__git_ps1`' # bash function . "$COMPLETION_PATH/git-prompt.sh"
PS1="$PS1"'\[\033[36m\]' # change color to cyan
PS1="$PS1"'`__git_ps1`' # bash function
fi
fi fi
fi fi
PS1="$PS1"'\[\033[0m\]' # change color PS1="$PS1"'\[\033[0m\]' # change color

14
vendor/psmodules/Cmder.ps1 vendored
View File

@ -32,7 +32,11 @@ function checkGit($Path) {
if($env:gitLoaded -eq 'false') { if($env:gitLoaded -eq 'false') {
$env:gitLoaded = Import-Git $env:gitLoaded = Import-Git
} }
Write-VcsStatus
if (getGitStatusSetting -eq $true) {
Write-VcsStatus
}
return return
} }
$SplitPath = split-path $path $SplitPath = split-path $path
@ -41,4 +45,12 @@ function checkGit($Path) {
} }
} }
function getGitStatusSetting() {
$gitStatus = (git config cmder.status) | out-string
if (($gitStatus -replace "`n" -replace "`r") -eq "false") {
return $false
} else {
return $true
}
}