From 851687cc920ac9a1bdc05b800f1dfec0b0f613f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= Date: Thu, 27 Feb 2014 16:11:47 +0100 Subject: [PATCH] [CodeSign] Cleanup. --- lib/motion/project/xcode_config.rb | 14 +++++++++----- lib/motion/util/code_sign.rb | 4 +++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/motion/project/xcode_config.rb b/lib/motion/project/xcode_config.rb index bd7b844b..e967180c 100644 --- a/lib/motion/project/xcode_config.rb +++ b/lib/motion/project/xcode_config.rb @@ -333,13 +333,17 @@ EOS def codesign_certificate(platform) @codesign_certificate ||= begin - cert_type = (distribution_mode ? 'Distribution' : 'Developer') - certs = Util::CodeSign.identity_names(release?).grep(/#{platform} #{cert_type}/) + type = (distribution_mode ? 'Distribution' : 'Developer') + certs = Util::CodeSign.identity_names(release?) + certs = certs.grep(/#{platform} #{type}/) if certs.size == 0 - App.fail "Cannot find any #{platform} #{cert_type} certificate in the keychain" + App.fail "Cannot find any #{platform} #{type} certificate in the" \ + "keychain" elsif certs.size > 1 - # TODO list all the values for the user's convenience. - App.warn "Found #{certs.size} #{platform} #{cert_type} certificates in the keychain. Set the `codesign_certificate' project setting to explicitely use one of (defaults to the first): #{certs.join(', ')}" + App.warn "Found #{certs.size} #{platform} #{type} certificates in " \ + "the keychain. Set the `codesign_certificate' project " \ + "setting to explicitely use one of (defaults to the " \ + "first): #{certs.join(', ')}" end certs.first end diff --git a/lib/motion/util/code_sign.rb b/lib/motion/util/code_sign.rb index a9253019..6ac95e9c 100644 --- a/lib/motion/util/code_sign.rb +++ b/lib/motion/util/code_sign.rb @@ -7,7 +7,9 @@ module Motion; module Util # @returns String The raw output from querying the `security` DB. # def query_security_db_for_identities(valid_only) - `/usr/bin/security -q find-identity -p codesigning#{' -v' if valid_only}`.strip + command = '/usr/bin/security -q find-identity -p codesigning' + command << ' -v' if valid_only + `#{command}`.strip end # @param Boolean valid_only Whether or not to include only valid code