adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better cake completion: don't barf on options, and don't clobber user's namespace

Browse Source
This commit is contained in:
Nick Stenning 2011-09-24 17:09:57 +01:00
parent 762b55bb2b
commit 8287cc177e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/cake/cake.plugin.zsh
View File

@ -1,18 +1,22 @@
# Set this to 1 if you want to cache the tasks # Set this to 1 if you want to cache the tasks
cache_task_list=1 _cake_cache_task_list=1
# Cache filename # Cache filename
cache_file='.cake_task_cache' _cake_task_cache_file='.cake_task_cache'
_cake_get_target_list () {
cake | grep '^cake ' | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'
}
_cake_does_target_list_need_generating () { _cake_does_target_list_need_generating () {
if [ $cache_task_list -eq 0 ]; then if [ ${_cake_cache_task_list} -eq 0 ]; then
return 1; return 1;
fi fi
if [ ! -f $cache_file ]; then return 0; if [ ! -f ${_cake_task_cache_file} ]; then return 0;
else else
accurate=$(stat -f%m $cache_file) accurate=$(stat -f%m $_cake_task_cache_file)
changed=$(stat -f%m Cakefile) changed=$(stat -f%m Cakefile)
return $(expr $accurate '>=' $changed) return $(expr $accurate '>=' $changed)
fi fi
@ -21,10 +25,10 @@ _cake_does_target_list_need_generating () {
_cake () { _cake () {
if [ -f Cakefile ]; then if [ -f Cakefile ]; then
if _cake_does_target_list_need_generating; then if _cake_does_target_list_need_generating; then
cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cache_file _cake_get_target_list > ${_cake_task_cache_file}
compadd `cat $cache_file` compadd `cat ${_cake_task_cache_file}`
else else
compadd `cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'` compadd `_cake_get_target_list`
fi fi
fi fi
} }