bin/imgkit in imgkit-1.6.0 vs bin/imgkit in imgkit-1.6.1

- old
+ new

@@ -7,11 +7,11 @@ require 'imgkit/version' GOOGLE_CODE_URL = ENV['GOOGLE_CODE_URL'] || "http://code.google.com/p/wkhtmltopdf/downloads/list?can=1" def detect_architecture - case arch = Config::CONFIG['arch'] + case arch = RbConfig::CONFIG['arch'] when /x86_64-linux/i 'amd64' when /linux/i 'i386' when /darwin/i @@ -31,21 +31,21 @@ `rm -rf wkhtmltoimage*` rescue nil `rm #{install_to}` rescue nil end def download_wkhtmltoimage(arch) - if ENV['BZIP'] + if ENV['BZIP'] download = "wkhtmltoimage-0.10.0_beta4-static-#{arch}.tar.bz2" url = "http://wkhtmltopdf.googlecode.com/files/wkhtmltoimage-0.10.0_beta4-static-#{arch}.tar.bz2" else page = open(GOOGLE_CODE_URL).read download = page.match(/href=".*name=(.*wkhtmltoimage-.*#{arch}.*?)&/) or cant_find_binaries(arch) download = download[1] url = "http://wkhtmltopdf.googlecode.com/files/#{download}" end puts "Downloading #{download} from #{url}" - + `curl #{url} > #{download}` download end def install(download, arch, install_to) @@ -75,12 +75,12 @@ parser.on("--install-wkhtmltoimage", "Install wkhtmltoimage binaries (TO=/usr/local/bin ARCHITECTURE=i386)") do @command = Proc.new do architecture = ENV['ARCHITECTURE'] || detect_architecture install_to = ENV['TO'] ? ENV['TO']+'/wkhtmltoimage' : IMGKit.configuration.wkhtmltoimage - + Dir.chdir '/tmp' - + cleanup(install_to) download = download_wkhtmltoimage(architecture) install(download, architecture, install_to) end end