mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-28 20:39:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: stack count variable names + compability with all init modes

Browse source
This commit is contained in:
lnu 2021-04-14 14:29:31 +02:00 committed by Jan De Dobbeleer
parent 4f96cc0f7c
commit 9c4ba43871
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/init/omp.bash
View file

@ -7,7 +7,7 @@ PS0='$(::OMP:: --millis > $TIMER_START)'
function _omp_hook() { function _omp_hook() {
local ret=$? local ret=$?
stack_count=$((${#DIRSTACK[@]} - 1)) omp_stack_count=$((${#DIRSTACK[@]} - 1))
omp_elapsed=-1 omp_elapsed=-1
if [[ -f $TIMER_START ]]; then if [[ -f $TIMER_START ]]; then
omp_now=$(::OMP:: --millis) omp_now=$(::OMP:: --millis)
@ -15,7 +15,7 @@ function _omp_hook() {
omp_elapsed=$((omp_now-omp_start_time)) omp_elapsed=$((omp_now-omp_start_time))
rm -f "$TIMER_START" rm -f "$TIMER_START"
fi fi
PS1="$(::OMP:: --config $POSH_THEME --shell bash --error $ret --execution-time $omp_elapsed --stack-count $stack_count)" PS1="$(::OMP:: --config $POSH_THEME --shell bash --error $ret --execution-time $omp_elapsed --stack-count $omp_stack_count)"
return $ret return $ret
} }

4
src/init/omp.fish
View file

@ -1,7 +1,7 @@
set -g posh_theme ::CONFIG:: set -g posh_theme ::CONFIG::
function fish_prompt function fish_prompt
set -l stack_count (count $dirstack) set -l omp_stack_count (count $dirstack)
set -l omp_duration "$CMD_DURATION$cmd_duration" set -l omp_duration "$CMD_DURATION$cmd_duration"
# check if variable set, < 3.2 case # check if variable set, < 3.2 case
if set -q omp_lastcommand; and test "$omp_lastcommand" = "" if set -q omp_lastcommand; and test "$omp_lastcommand" = ""
@ -15,7 +15,7 @@ function fish_prompt
set -gx omp_last_status_generation $status_generation set -gx omp_last_status_generation $status_generation
end end
::OMP:: --config $posh_theme --error $status --execution-time $omp_duration --stack-count $stack_count ::OMP:: --config $posh_theme --error $status --execution-time $omp_duration --stack-count $omp_stack_count
end end
function postexec_omp --on-event fish_postexec function postexec_omp --on-event fish_postexec

5
src/init/omp.ps1
View file

@ -65,10 +65,13 @@ function global:Initialize-ModuleSupport {
} }
} }
$stackCount = 0 # read stack count from current stack(if invoked from profile=right value,otherwise use the global variable set in Set-PoshPrompt(stack scoped to module))
$stackCount = (Get-Location -stack).Count
try { try {
if($global:omp_global_sessionstate -ne $null){
$stackCount = ($global:omp_global_sessionstate).path.locationstack('').count $stackCount = ($global:omp_global_sessionstate).path.locationstack('').count
} }
}
catch {} catch {}
$executionTime = -1 $executionTime = -1

5
src/init/omp.zsh
View file

@ -5,18 +5,19 @@ function omp_preexec() {
} }
function omp_precmd() { function omp_precmd() {
stack_count=${#dirstack[@]} omp_stack_count=${#dirstack[@]}
omp_last_error=$? omp_last_error=$?
omp_elapsed=-1 omp_elapsed=-1
if [ $omp_start_time ]; then if [ $omp_start_time ]; then
omp_now=$(::OMP:: --millis) omp_now=$(::OMP:: --millis)
omp_elapsed=$(($omp_now-$omp_start_time)) omp_elapsed=$(($omp_now-$omp_start_time))
fi fi
eval "$(::OMP:: --config $POSH_THEME --error $omp_last_error --execution-time $omp_elapsed --stack-count $stack_count --eval --shell zsh)" eval "$(::OMP:: --config $POSH_THEME --error $omp_last_error --execution-time $omp_elapsed --stack-count $omp_stack_count --eval --shell zsh)"
unset omp_start_time unset omp_start_time
unset omp_now unset omp_now
unset omp_elapsed unset omp_elapsed
unset omp_last_error unset omp_last_error
unset omp_stack_count
} }
function install_omp_hooks() { function install_omp_hooks() {