Download as
Browse Code »

Commit 5ebd5e2c3f45a5f6aaa8dd26fafc52462d6c51c0

Authored by Antonio Terceiro
2 parents 10aff692 3c4d2c8d
Exists in master and in 11 other branches angular_poc, backup-7-jan-2016, export-comment-paragraph, login-captcha, new_video_plugin, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, staging, theme-brasil-digital-from-staging, travis

Merge remote-tracking branch 'origin/master' into rails4

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
lib/noosfero/version.rb
  Diff comments   View file @5ebd5e2
@@ -4,7 +4,7 @@ module Noosfero @@ -4,7 +4,7 @@ module Noosfero
4 end 4 end
5 5
6 root = File.expand_path(File.dirname(__FILE__) + '/../..') 6 root = File.expand_path(File.dirname(__FILE__) + '/../..')
7 -if File.exist?(File.join(root, '.git')) 7 +if File.exist?(File.join(root, '.git')) && system('which git >/dev/null')
8 git_version = Dir.chdir(root) { `git describe --tags`.to_s.strip.sub('-rc', '~rc') } 8 git_version = Dir.chdir(root) { `git describe --tags`.to_s.strip.sub('-rc', '~rc') }
9 if git_version > Noosfero::VERSION 9 if git_version > Noosfero::VERSION
10 Noosfero::VERSION.clear << git_version 10 Noosfero::VERSION.clear << git_version