diff options
Diffstat (limited to 'lib/license/management/tool_box.rb')
| -rw-r--r-- | lib/license/management/tool_box.rb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/license/management/tool_box.rb b/lib/license/management/tool_box.rb index 6906cb5..dc63f0e 100644 --- a/lib/license/management/tool_box.rb +++ b/lib/license/management/tool_box.rb @@ -16,17 +16,15 @@ module License Dir.chdir(project_path) do deb = deb_for(tool, version) if deb&.exist? - ::License::Management.logger.error("Installing #{deb} ...") shell.execute([:dpkg, '-i', deb], capture: false) else - ::License::Management.logger.error("Installing #{version} via asdf ...") - shell.execute([:asdf, "plugin-update", tool.to_s], env: env) - shell.execute(['/opt/asdf/plugins/nodejs/bin/import-release-team-keyring']) if tool == :nodejs + shell.execute([:asdf, "plugin-update", tool.to_s], env: env, capture: false) + shell.execute(['/opt/asdf/plugins/nodejs/bin/import-release-team-keyring'], capture: false) if tool == :nodejs end install_common_libraries(env: env) if C_BASED_TOOLS.include?(tool.to_sym) shell.execute([:asdf, :install, tool.to_s, version], env: env, capture: false) - shell.execute([:asdf, :local, tool.to_s, version], env: env) - shell.execute([:asdf, :reshim], env: env) + shell.execute([:asdf, :local, tool.to_s, version], env: env, capture: false) + shell.execute([:asdf, :reshim], env: env, capture: false) end install_certificates_into_java_keystore(env, version) if tool == :java end @@ -56,8 +54,8 @@ module License Dir.chdir(project_path) do return unless deb_for(tool, version)&.exist? - shell.execute([:dpkg, '-r', "#{tool}-#{version}"]) - shell.execute([:asdf, :reshim]) + shell.execute([:dpkg, '-r', "#{tool}-#{version}"], capture: false) + shell.execute([:asdf, :reshim], capture: false) end end @@ -124,8 +122,8 @@ module License Dir.chdir shell.custom_certificate_path.dirname do Dir.glob('custom.*.crt').each do |path| - 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) + shell.execute([:keytool, '-importcert', '-alias', Time.now.to_i, '-file', File.expand_path(path), '-trustcacerts', '-noprompt', '-storepass', 'changeit', '-keystore', keystore_path], env: env, capture: false) + shell.execute([:keytool, '-list', '-v', '-storepass changeit', '-keystore', keystore_path], env: env, capture: false) end end end |
