diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-02-25 12:12:09 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-03-03 08:40:29 +0100 |
commit | 2b816075dc71dfe8f6f9e5349fdff7f03ad9dad0 (patch) | |
tree | 876e04b4c1a0d844fa1b1f023fd075ba521495ab /lib/gitlab | |
parent | a9dcfd851f80c35522ac844b316af783d0db7e64 (diff) | |
download | gitlab-ce-2b816075dc71dfe8f6f9e5349fdff7f03ad9dad0.tar.gz |
Replace backticks with Gitlab::Popen
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/logger.rb | 6 | ||||
-rw-r--r-- | lib/gitlab/upgrader.rb | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 389eef3395f..64cf3303ea3 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb @@ -11,12 +11,14 @@ module Gitlab def self.read_latest path = Rails.root.join("log", file_name) self.build unless File.exist?(path) - logs = `tail -n 2000 #{path}`.split("\n") + tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path})) + tail_output.split("\n") end def self.read_latest_for filename path = Rails.root.join("log", filename) - logs = `tail -n 2000 #{path}`.split("\n") + tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path})) + tail_output.split("\n") end def self.build diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb index f46685e4bbe..f17ad0d79cc 100644 --- a/lib/gitlab/upgrader.rb +++ b/lib/gitlab/upgrader.rb @@ -42,8 +42,9 @@ module Gitlab end def latest_version_raw - git_tags = `git ls-remote --tags origin | grep tags\/v#{current_version.major}` - git_tags = git_tags.lines.to_a.select { |version| version =~ /v\d\.\d\.\d\Z/ } + remote_tags, _ = Gitlab::Popen.popen(%W(git ls-remote --tags origin)) + git_tags = remote_tags.split("\n").grep(/tags\/v#{current_version.major}/) + git_tags = git_tags.select { |version| version =~ /v\d\.\d\.\d\Z/ } last_tag = git_tags.last.match(/v\d\.\d\.\d/).to_s end |