Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

simplify release_version as deploy script now puts the REVISOIN into …

…the VERSION file
  • Loading branch information...
commit f529c8c9d4edc235ff05d7cd0d2a155370945a8c 1 parent d5aefc8
Kevin Olbrich authored
Showing with 2 additions and 14 deletions.
  1. +2 −14 models/inode.rb
View
16 models/inode.rb
@@ -70,26 +70,14 @@ def delete(uuid)
super
end
- def branch
+ def release_version
if File.exists?('/var/6fusion/adaptor-vmware/current/VERSION')
File.read('/var/6fusion/adaptor-vmware/current/VERSION').chomp
else
- `git branch --no-color 2> /dev/null`.chomp.split("\n").grep(/^[*]/).first[/(\S+)$/, 1]
- end
- end
-
- def revision
- if File.exists?('/var/6fusion/adaptor-vmware/current/REVISION')
- File.read('/var/6fusion/adaptor-vmware/current/REVISION').chomp
- else
- `git rev-parse HEAD`.chomp
+ "#{`git branch --no-color 2> /dev/null`.chomp.split("\n").grep(/^[*]/).first[/(\S+)$/, 1]} #{`git rev-parse HEAD`.chomp}"
end
end
- def release_version
- "#{branch} (#{revision})"
- end
-
def close_connection
vmware_api_adaptor.disconnect if vmware_api_adaptor
end
Please sign in to comment.
Something went wrong with that request. Please try again.