combat 0.8.5 → 0.8.6

data/lib/settings.rb

@@ -16,7 +16,12 @@ class Settings
     @ipa_file = "#{@filename}.ipa"
     @plist_file_url = "#{@url}#{@plist_file}"
     @template_file = options[:template] || "#{COMBAT_ROOT}/templates/template.erb"
-    @qrcode = "http://qrcode.kaywa.com/img.php?s=8&d=#{ERB::Util.url_encode(@url)}"
+    
+    if (type == 'android')
+      @qrcode = "http://qrcode.kaywa.com/img.php?s=8&d=#{ERB::Util.url_encode(@url)}#{@filename}.apk"
+    else
+      @qrcode = "http://qrcode.kaywa.com/img.php?s=8&d=#{ERB::Util.url_encode(@url)}"
+    end
   end
   
   def user_and_host

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Combat
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

data/templates/template.erb

@@ -75,8 +75,13 @@
         <% end %>
       </ol>
       <p class="desktop_only">
-        QR code to this page
-        <img src="<%= @qrcode %>" />
+        <% if @type == 'android' %>
+          Use QR code to install APK
+          <img src="<%= @qrcode %>" />
+        <% else %>
+          QR code to this page
+          <img src="<%= @qrcode %>" />
+        <% end %>
       </p>
     </div>
   </body>

metadata

@@ -2,7 +2,7 @@
 name: combat
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - Tomislav Car