Skip to content

fix handling of version strings #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
digitalmoksha wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix handling of version strings #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/motion/project/appcast.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,18 @@ def appcast_xml
atom_link.attributes['rel'] = 'self'
atom_link.attributes['type'] = "application/rss+xml"
item = channel.add_element 'item'
item.add_element('title').text = "#{@config.name} #{@config.version}"
item.add_element('title').text = "#{@config.name} #{@config.short_version}"
item.add_element('pubDate').text = Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
guid = item.add_element('guid')
guid.text = "#{@config.name}-#{@config.version}"
guid.text = "#{@config.name}-#{@config.short_version}"
guid.attributes['isPermaLink'] = false
item.add_element('sparkle:releaseNotesLink').text = "#{appcast.notes_url}"
enclosure = item.add_element('enclosure')
enclosure.attributes['url'] = "#{appcast.package_url}"
enclosure.attributes['length'] = "#{@package_size}"
enclosure.attributes['type'] = "application/octet-stream"
enclosure.attributes['sparkle:version'] = @config.version
enclosure.attributes['sparkle:shortVersionString'] = @config.short_version
enclosure.attributes['sparkle:dsaSignature'] = @package_signature
rss
end
Expand Down
4 changes: 2 additions & 2 deletions lib/motion/project/package.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ def package
@config.build_mode = :release
return unless create_zip_file
App.info "Release", version_string
App.info "Version", @config.version
App.info "Build", @config.short_version || 'unspecified in Rakefile'
App.info "Version", @config.short_version
App.info "Build", @config.version || 'unspecified in Rakefile'
App.info "Size", @package_size.to_s
sign_package
create_appcast
Expand Down
2 changes: 1 addition & 1 deletion lib/motion/project/sparkle.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def version(vstring)
end

def version_string
"#{@config.version} (#{@config.short_version})"
"#{@config.short_version} (#{@config.version})"
end

def feed_url(url)
Expand Down