stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compatibility with Zsh arrays

Browse Source 
* Zsh arrays starts at 1
* Zsh arrays have to be declared before being assigned
This commit is contained in:
Nicolas Pouillard 2013-06-02 11:02:34 +02:00
parent 8757c58243
commit 37d0777b74
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
liquidprompt
View File

@ -63,6 +63,7 @@ if test -n "$BASH_VERSION" -a -n "$PS1" -a -n "$TERM" ; then
_LP_USER_SYMBOL="\u" _LP_USER_SYMBOL="\u"
_LP_HOST_SYMBOL="\h" _LP_HOST_SYMBOL="\h"
_LP_TIME_SYMBOL="\t" _LP_TIME_SYMBOL="\t"
_LP_FIRST_INDEX=0
elif test -n "$ZSH_VERSION" ; then elif test -n "$ZSH_VERSION" ; then
_LP_SHELL_bash=false _LP_SHELL_bash=false
_LP_SHELL_zsh=true _LP_SHELL_zsh=true
@ -71,6 +72,7 @@ elif test -n "$ZSH_VERSION" ; then
_LP_USER_SYMBOL="%n" _LP_USER_SYMBOL="%n"
_LP_HOST_SYMBOL="%m" _LP_HOST_SYMBOL="%m"
_LP_TIME_SYMBOL="%*" _LP_TIME_SYMBOL="%*"
_LP_FIRST_INDEX=1
else else
echo "liquidprompt: shell not supported" >&2 echo "liquidprompt: shell not supported" >&2
return return
@ -1000,9 +1002,9 @@ _lp_bzr_branch_color()
output=$(bzr version-info --check-clean --custom --template='{branch_nick} {revno} {clean}' 2> /dev/null) output=$(bzr version-info --check-clean --custom --template='{branch_nick} {revno} {clean}' 2> /dev/null)
[[ $? -ne 0 ]] && return [[ $? -ne 0 ]] && return
local tuple=($output) local tuple=($output)
local branch=${tuple[0]} local branch=${tuple[_LP_FIRST_INDEX+0]}
local revno=${tuple[1]} local revno=${tuple[_LP_FIRST_INDEX+1]}
local clean=${tuple[2]} local clean=${tuple[_LP_FIRST_INDEX+2]}
if [[ -n "$branch" ]] ; then if [[ -n "$branch" ]] ; then
if [[ "$clean" -eq 0 ]] ; then if [[ "$clean" -eq 0 ]] ; then
@ -1357,10 +1359,11 @@ _lp_time_analog()
{ {
# get the date as "hours(12) minutes" in a single call # get the date as "hours(12) minutes" in a single call
# make a bash array with it # make a bash array with it
local d=( $(date "+%I %M") ) local -a d
d=( $(date "+%I %M") )
# separate hours and minutes # separate hours and minutes
local -i hour=${d[0]#0} # no leading 0 local -i hour=${d[_LP_FIRST_INDEX+0]#0} # no leading 0
local -i min=${d[1]#0} local -i min=${d[_LP_FIRST_INDEX+1]#0}
# The targeted unicode characters are the "CLOCK FACE" ones # The targeted unicode characters are the "CLOCK FACE" ones
# They are located in the codepages between: # They are located in the codepages between:
@ -1368,8 +1371,10 @@ _lp_time_analog()
# U+1F55C (ONE-THIRTY) and U+1F567 (TWELVE-THIRTY), for the thirties # U+1F55C (ONE-THIRTY) and U+1F567 (TWELVE-THIRTY), for the thirties
# #
local plain=(🕐 🕑 🕒 🕓 🕔 🕕 🕖 🕗 🕘 🕙 🕚 🕛 ) local -a plain
local half=(🕜 🕝 🕞 🕟 🕠 🕡 🕢 🕣 🕤 🕥 🕦 🕧 ) plain=(🕐 🕑 🕒 🕓 🕔 🕕 🕖 🕗 🕘 🕙 🕚 🕛 )
local -a half
half=(🕜 🕝 🕞 🕟 🕠 🕡 🕢 🕣 🕤 🕥 🕦 🕧 )
# array index starts at 0 # array index starts at 0
local -i hi=hour-1 local -i hi=hour-1