dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-07-01 19:49:25 +00:00
Code Issues Releases Wiki Activity

Merge upstream/master

Browse Source
This commit is contained in:
Daniel Carrillo
2022-04-03 13:28:52 +02:00
parent 45adecd9c9 3da67271b9
commit fca913eded
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/archive/functions/unarchive
View File

@ -34,10 +34,10 @@ fi
# here, we check for dropin/multi-threaded replacements
# this should eventually be moved to modules/archive/init.zsh
# as a global alias
if (( $+commands[pigz] )); then
_gzip_bin='pigz'
if (( $+commands[unpigz] )); then
_gzip_bin='unpigz'
else
_gzip_bin='gzip'
_gzip_bin='gunzip'
fi
if (( $+commands[pixz] )); then
@ -46,12 +46,12 @@ else
_xz_bin='xz'
fi
if (( $+commands[lbzip2] )); then
_bzip2_bin='lbzip2'
elif (( $+commands[pbzip2] )); then
_bzip2_bin='pbzip2'
if (( $+commands[lbunzip2] )); then
_bzip2_bin='lbunzip2'
elif (( $+commands[pbunzip2] )); then
_bzip2_bin='pbunzip2'
else
_bzip2_bin='bzip2'
_bzip2_bin='bunzip2'
fi
_zstd_bin='zstd'

5
modules/git/functions/git-info
View File

@ -417,6 +417,11 @@ function git-info {
if (( dirty > 0 )); then
zstyle -s ':prezto:module:git:info:dirty' format 'dirty_format'
zformat -f dirty_formatted "$dirty_format" "D:$dirty"
# Overwrite branch format to use dirty-branch format
zstyle -s ':prezto:module:git:info:dirty-branch' format 'branch_format'
if [[ -n "$branch" && -n "$branch_format" ]]; then
zformat -f branch_formatted "$branch_format" "b:$branch"
fi
else
zstyle -s ':prezto:module:git:info:clean' format 'clean_formatted'
fi