Merge branch 'master' of github.com:wycats/handlebars.js

2011-02-25 22:36:49 -08:00
parent 2b319bef2f 935053cc33
commit 6fbdf4b445
2 changed files with 7 additions and 2 deletions
@@ -2,3 +2,4 @@ dist
 lib/handlebars/parser.js
 vendor
 .rvmrc
+.DS_Store
@@ -2,8 +2,12 @@ require "rubygems"
 require "bundler/setup"

 file "lib/handlebars/parser.js" => ["src/handlebars.yy","src/handlebars.l"] do
-  system "jison src/handlebars.yy src/handlebars.l"
-  sh "mv handlebars.js lib/handlebars/parser.js"
+  if ENV['PATH'].split(':').any? {|folder| File.exists?(folder+'/jison')}
+    system "jison src/handlebars.yy src/handlebars.l"
+    sh "mv handlebars.js lib/handlebars/parser.js"
+  else
+    puts "Jison is not installed. Try running `npm install jison`."
+  end
 end

 task :compile => "lib/handlebars/parser.js"