linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-03 04:20:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflict merge 1

Browse source
This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/rake-fast/rake-fast.plugin.zsh
View file

@ -8,7 +8,21 @@ _rake_refresh () {
}
_rake_does_task_list_need_generating () {
<<<<<<< HEAD
[[ ! -f .rake_tasks ]] || [[ Rakefile -nt .rake_tasks ]]
=======
if [ ! -f .rake_tasks ]; then return 0;
else
if [[ "$OSTYPE" = darwin* ]]; then
accurate=$(stat -f%m .rake_tasks)
changed=$(stat -f%m Rakefile)
else
accurate=$(stat -c%Y .rake_tasks)
changed=$(stat -c%Y Rakefile)
fi
return $(expr $accurate '>=' $changed)
fi
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
}
_rake_generate () {