von/vdotfiles
1
0
Fork 0
Code Activity

better test, replace local with typeset

Browse source
This commit is contained in:
Von Random 2019-01-31 16:08:03 +03:00
parent 82c1e621dd
commit 49a728356e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zshrc
View file

@ -85,7 +85,7 @@ precmd.title() {
esac esac
} }
precmd.is_git_repo() { precmd.is_git_repo() {
local curr_dir=$PWD typeset curr_dir=$PWD
while [[ -n $curr_dir ]]; do while [[ -n $curr_dir ]]; do
if [[ -r $curr_dir/.git/HEAD ]]; then if [[ -r $curr_dir/.git/HEAD ]]; then
return 0 return 0
@ -98,10 +98,12 @@ precmd.is_git_repo() {
precmd.git() { precmd.git() {
precmd.is_git_repo || return 0 precmd.is_git_repo || return 0
local raw_status="$(flock -w 0 $prompt_state_file git --no-optional-locks status --porcelain -bu 2>/dev/null)" typeset raw_status
[[ -n $raw_status ]] || return 0 raw_status="$(flock -w 0 $prompt_state_file git --no-optional-locks status --porcelain -bu 2>/dev/null)"
local branch_info full_status git_status= IFS= (($?)) && return 0
local staged_count=0 unstaged_count=0 untracked_count=0 unmerged_count=0
typeset branch_info full_status git_status= IFS=
typeset staged_count=0 unstaged_count=0 untracked_count=0 unmerged_count=0
while read line; do while read line; do
[[ $line[1,2] == '##' ]] && branch_info=$line[4,-1] [[ $line[1,2] == '##' ]] && branch_info=$line[4,-1]
@ -204,7 +206,7 @@ fi
# some cool git stuff # some cool git stuff
gdiff() { /usr/bin/git diff --color "$@"; } gdiff() { /usr/bin/git diff --color "$@"; }
gdf() { gdf() {
local difftool typeset difftool
if difftool=$(whence diff-so-fancy); then if difftool=$(whence diff-so-fancy); then
gdiff "$@" | $difftool | less --tabs=4 -RSFX gdiff "$@" | $difftool | less --tabs=4 -RSFX
else else