From aa53a1a3fc69f42965c1569ce4496aaccae265f9 Mon Sep 17 00:00:00 2001 From: mo khan Date: Tue, 15 Sep 2020 16:40:48 -0600 Subject: refactor: declare variable outside of loop --- lib/license/management/tool_box.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/license/management/tool_box.rb b/lib/license/management/tool_box.rb index 4c41b36..239f88f 100644 --- a/lib/license/management/tool_box.rb +++ b/lib/license/management/tool_box.rb @@ -117,10 +117,11 @@ module License end def install_certificates_into_java_keystore(env, version) + java_home = Pathname.new(env['JAVA_HOME']) + keystore_path = java_home.join("8" == version ? "jre/lib/security/cacerts" : "lib/security/cacerts") + Dir.chdir shell.custom_certificate_path.dirname do Dir.glob('custom.*.crt').each do |path| - java_home = Pathname.new(env['JAVA_HOME']) - keystore_path = "8" == version ? java_home.join("jre/lib/security/cacerts") : java_home.join("lib/security/cacerts") shell.execute([:keytool, '-importcert', '-alias', Time.now.to_i, '-file', File.expand_path(path), '-trustcacerts', '-noprompt', '-storepass', 'changeit', '-keystore', keystore_path], env: env) shell.execute([:keytool, '-list', '-v', '-storepass changeit', '-keystore', keystore_path], env: env) end -- cgit v1.2.3