admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

gpg: make executable a function, not a constant

Browse Source 
It's a lot nicer to call `Gpg.executable` rather than
`Gpg::GPG_EXECUTABLE` externally. Also squash some logic.
This commit is contained in:
Dominyk Tiller 2017-10-22 02:48:38 +01:00
parent ce0e96c320
commit dad939c4d1
No known key found for this signature in database
GPG Key ID: FE19AEFCF658C6F6
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/gpg.rb
View File

@ -11,18 +11,12 @@ class Gpg
end
end
def self.gpg
find_gpg("gpg")
def self.executable
find_gpg("gpg") || find_gpg("gpg2")
end
def self.gpg2
find_gpg("gpg2")
end
GPG_EXECUTABLE = gpg || gpg2
def self.available?
File.executable?(GPG_EXECUTABLE.to_s)
File.executable?(executable.to_s)
end
def self.version
@ -43,12 +37,12 @@ class Gpg
%no-protection
%commit
EOS
system GPG_EXECUTABLE, "--batch", "--gen-key", "batch.gpg"
system executable, "--batch", "--gen-key", "batch.gpg"
end
def self.cleanup_test_processes!
odie "No GPG present to test against!" unless available?
gpgconf = Pathname.new(GPG_EXECUTABLE).parent/"gpgconf"
gpgconf = Pathname.new(executable).parent/"gpgconf"
system gpgconf, "--kill", "gpg-agent"
system gpgconf, "--homedir", "keyrings/live", "--kill",