[#221 Use git rev-parse to get the current sha for the version string
This commit is contained in:
parent
5603103295
commit
79073734a1
|
@ -37,24 +37,12 @@ module ChiliProject
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.revision
|
def self.revision
|
||||||
revision = nil
|
revision = `git rev-parse HEAD`
|
||||||
entries_path = "#{RAILS_ROOT}/.svn/entries"
|
if revision.present?
|
||||||
if File.readable?(entries_path)
|
revision.strip[0..8]
|
||||||
begin
|
else
|
||||||
f = File.open(entries_path, 'r')
|
nil
|
||||||
entries = f.read
|
end
|
||||||
f.close
|
|
||||||
if entries.match(%r{^\d+})
|
|
||||||
revision = $1.to_i if entries.match(%r{^\d+\s+dir\s+(\d+)\s})
|
|
||||||
else
|
|
||||||
xml = REXML::Document.new(entries)
|
|
||||||
revision = xml.elements['wc-entries'].elements[1].attributes['revision'].to_i
|
|
||||||
end
|
|
||||||
rescue
|
|
||||||
# Could not find the current revision
|
|
||||||
end
|
|
||||||
end
|
|
||||||
revision
|
|
||||||
end
|
end
|
||||||
|
|
||||||
REVISION = self.revision
|
REVISION = self.revision
|
||||||
|
|
Loading…
Reference in New Issue