Merge branch '273155-recursive' into 'main'v3.28.2

Detect maven/gradle wrapper in sub directory

See merge request gitlab-org/security-products/analyzers/license-finder!15

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/license/management/tool_box.rb b/lib/license/management/tool_box.rb
index ddfd222..6906cb5 100644
--- a/lib/license/management/tool_box.rb
+++ b/lib/license/management/tool_box.rb
@@ -17,17 +17,17 @@ module License
           deb = deb_for(tool, version)
           if deb&.exist?
             ::License::Management.logger.error("Installing #{deb} ...")
-            shell.execute([:dpkg, '-i', 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
           end
-          shell.execute([:asdf, :install, tool.to_s, version], env: env)
+          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)
         end
-        install_common_libraries(env: env) if C_BASED_TOOLS.include?(tool.to_sym)
         install_certificates_into_java_keystore(env, version) if tool == :java
       end