diff options
author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-11-03 16:48:52 +0000 |
---|---|---|
committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-11-03 16:48:52 +0000 |
commit | 4d6b2e47ac5b135097bc8eb7b2b1ebae65668647 (patch) | |
tree | 8f6174fafcc7c356087fc209991b89dea0c3295d /lib/mauve/web_interface.rb | |
parent | f93f0948e028c33694cf7f90c7d5918cbf27971c (diff) | |
parent | 6f689f2fa872f507527c10fa9b44cdbb96ebd3e0 (diff) |
Merge
Diffstat (limited to 'lib/mauve/web_interface.rb')
-rw-r--r-- | lib/mauve/web_interface.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/mauve/web_interface.rb b/lib/mauve/web_interface.rb index 716aaf3..b998ad8 100644 --- a/lib/mauve/web_interface.rb +++ b/lib/mauve/web_interface.rb @@ -5,7 +5,18 @@ require 'json' require 'mauve/authentication' -require 'sinatra/tilt' +tilt_lib = "tilt" +begin + require tilt_lib +rescue LoadError => ex + if tilt_lib == "tilt" + tilt_lib = "sinatra/tilt" + retry + end + + raise ex +end + require 'sinatra/base' require 'sinatra-partials' |