diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-11-03 16:44:45 +0000 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-11-03 16:44:45 +0000 |
| commit | 0515cd0ecd48494058e12f96233199026133124c (patch) | |
| tree | 1b58974140b94b0a39fa8d262f052fe32ba18919 /lib/mauve | |
| parent | 4edc5d3018380438351cb6b4058215ebe4d8e5b3 (diff) | |
Fixed tilt library loading location.
Diffstat (limited to 'lib/mauve')
| -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' |