summaryrefslogtreecommitdiff
path: root/lib/license/management/shell.rb
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-11-10 18:43:31 +0000
committermo khan <mo.khan@gmail.com>2020-11-10 18:43:31 +0000
commit191185c4303768c6d9a1431c35143501c06ee4d7 (patch)
tree97e7ac6fffec356e57b0c52e10eacd716281830e /lib/license/management/shell.rb
parent1bc270fea3b352b44dfcef3fe16e97a2bbd4d7a5 (diff)
parent91f1671c67de9c51407f8527d8fc6197463151d2 (diff)
Merge branch '273255-streaming' into 'main'HEADv3.28.3main
Stream `npm ci` output to log See merge request gitlab-org/security-products/analyzers/license-finder!16
Diffstat (limited to 'lib/license/management/shell.rb')
-rw-r--r--lib/license/management/shell.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb
index 6a6f0b6..c947a5c 100644
--- a/lib/license/management/shell.rb
+++ b/lib/license/management/shell.rb
@@ -16,6 +16,7 @@ module License
keytool: '/opt/asdf/bin/asdf exec keytool',
mono: '/opt/asdf/installs/mono/6.8.0.123/bin/mono',
mvn: '/opt/asdf/bin/asdf exec mvn',
+ npm: '/opt/asdf/bin/asdf exec npm',
nuget: '/opt/asdf/installs/mono/6.8.0.123/bin/nuget.exe',
pip: '/opt/asdf/bin/asdf exec pip',
ruby: '/opt/asdf/bin/asdf exec ruby',
@@ -64,15 +65,15 @@ module License
def trust!(certificate)
custom_certificate_path.write(certificate)
Dir.chdir custom_certificate_path.dirname do
- execute([:awk, SPLIT_SCRIPT, '<', custom_certificate_path])
- execute('update-ca-certificates -v')
+ execute([:awk, SPLIT_SCRIPT, '<', custom_certificate_path], capture: false)
+ execute('update-ca-certificates -v', capture: false)
Dir.glob('custom.*.crt').each do |path|
- execute([:openssl, :x509, '-in', File.expand_path(path), '-text', '-noout'])
+ execute([:openssl, :x509, '-in', File.expand_path(path), '-text', '-noout'], capture: false)
end
end
- execute([:cp, custom_certificate_path.to_s, "/usr/lib/ssl/certs/"])
- execute([:c_rehash, '-v'])
+ execute([:cp, custom_certificate_path.to_s, "/usr/lib/ssl/certs/"], capture: false)
+ execute([:c_rehash, '-v'], capture: false)
end
def present?(item)