diff options
| author | Dominyk Tiller | 2017-08-09 16:52:52 +0100 |
|---|---|---|
| committer | Dominyk Tiller | 2017-08-09 17:04:50 +0100 |
| commit | ca9b8bea2e57264a9ff7c2be8d0dd02ba25eafb3 (patch) | |
| tree | 304efdcece44095e14dd2e3a9e74f8011939a7af /Library | |
| parent | 0933686dea7f65043480f8f7d6a1ceb05bf83238 (diff) | |
| download | brew-ca9b8bea2e57264a9ff7c2be8d0dd02ba25eafb3.tar.bz2 | |
gpg: flip search priority order
Makes more sense this way around now Homebrew has migrated across
to 2.1.x & the latest version of that doesn't install as `gpg2`
any more.
Doesn't need to be merged before this PR but for the sake of referencing
the PR introducing the upstream death of the `gpg2` symlink is:
https://github.com/Homebrew/homebrew-core/pull/16580
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/gpg.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/gpg.rb b/Library/Homebrew/gpg.rb index cb9e367df..3b7c4f726 100644 --- a/Library/Homebrew/gpg.rb +++ b/Library/Homebrew/gpg.rb @@ -7,8 +7,8 @@ class Gpg next unless gpg_short_version gpg_version = Version.create(gpg_short_version.to_s) @version = gpg_version - gpg_version == Version.create("2.0") || - gpg_version == Version.create("2.1") + gpg_version == Version.create("2.1") || + gpg_version == Version.create("2.0") end end @@ -20,7 +20,7 @@ class Gpg find_gpg("gpg2") end - GPG_EXECUTABLE = gpg2 || gpg + GPG_EXECUTABLE = gpg || gpg2 def self.available? File.executable?(GPG_EXECUTABLE.to_s) |