diff options
| author | Jack Nagel | 2014-06-20 18:36:18 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-06-20 18:37:24 -0500 |
| commit | f0e13ee97bd1aba765d266806f9175761311e9d4 (patch) | |
| tree | 3b38b238a02b03362cf1bd1c3b63c71034fbab0a /Library | |
| parent | 8667387bee57b7f9fbf84921b4c2f462ae2a6852 (diff) | |
| download | brew-f0e13ee97bd1aba765d266806f9175761311e9d4.tar.bz2 | |
Use multiple argument form of system
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/build.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/tap.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/update.rb | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index f3455d124..5a320f3b8 100644 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -147,8 +147,8 @@ class Build f.brew do if ARGV.flag? '--git' - system "git init" - system "git add -A" + system "git", "init" + system "git", "add", "-A" end if ARGV.interactive? ohai "Entering interactive mode" diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb index e3795ce6f..d13921572 100644 --- a/Library/Homebrew/cmd/tap.rb +++ b/Library/Homebrew/cmd/tap.rb @@ -21,7 +21,7 @@ module Homebrew # we downcase to avoid case-insensitive filesystem issues tapd = HOMEBREW_LIBRARY/"Taps/#{user.downcase}/homebrew-#{repo.downcase}" return false if tapd.directory? - abort unless system "git clone https://github.com/#{repouser}/homebrew-#{repo} #{tapd}" + abort unless system "git", "clone", "https://github.com/#{repouser}/homebrew-#{repo}", tapd.to_s files = [] tapd.find_formula { |file| files << file } diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 4322241d6..21e119d0c 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -77,17 +77,17 @@ module Homebrew private def git_init_if_necessary - if Dir['.git/*'].empty? - safe_system "git init" - safe_system "git config core.autocrlf false" - safe_system "git remote add origin https://github.com/Homebrew/homebrew.git" - safe_system "git fetch origin" - safe_system "git reset --hard origin/master" + if Dir[".git/*"].empty? + safe_system "git", "init" + safe_system "git", "config", "core.autocrlf", "false" + safe_system "git", "remote", "add", "origin", "https://github.com/Homebrew/homebrew.git" + safe_system "git", "fetch", "origin" + safe_system "git", "reset", "--hard", "origin/master" end if `git remote show origin -n` =~ /Fetch URL: \S+mxcl\/homebrew/ - safe_system "git remote set-url origin https://github.com/Homebrew/homebrew.git" - safe_system "git remote set-url --delete origin .*mxcl\/homebrew.*" + safe_system "git", "remote", "set-url", "origin", "https://github.com/Homebrew/homebrew.git" + safe_system "git", "remote", "set-url", "--delete", "origin", ".*mxcl\/homebrew.*" end rescue Exception FileUtils.rm_rf ".git" @@ -138,12 +138,12 @@ class Updater attr_reader :initial_revision, :current_revision def pull! - safe_system "git checkout -q master" + safe_system "git", "checkout", "-q", "master" @initial_revision = read_current_revision # ensure we don't munge line endings on checkout - safe_system "git config core.autocrlf false" + safe_system "git", "config", "core.autocrlf", "false" args = ["pull"] args << "--rebase" if ARGV.include? "--rebase" |
