From 60ac0f2df85e4e4655b96b358dcc1ba40fe61a3e Mon Sep 17 00:00:00 2001 From: mo khan Date: Tue, 5 May 2020 15:28:58 -0600 Subject: Specify npm cafile setting * [cafile](https://docs.npmjs.com/using-npm/config#cafile) * Use host network for development scripts * Specify path to JAVA keystore in list command * Add CHANGELOG entry --- lib/license/management/shell.rb | 7 ++++++- lib/license/management/version.rb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb index 9ff59c4..fcf8188 100644 --- a/lib/license/management/shell.rb +++ b/lib/license/management/shell.rb @@ -44,6 +44,7 @@ module License Dir.chdir custom_certificate_path.dirname do execute([:awk, SPLIT_SCRIPT, '<', custom_certificate_path]) execute('update-ca-certificates -v') + execute([:npm, :config, :set, :cafile, custom_certificate_path]) Dir.glob('custom.*.crt').each do |path| full_path = File.expand_path(path) @@ -58,7 +59,11 @@ module License '-storepass', 'changeit', '-keystore', "#{ENV['JAVA_HOME']}/jre/lib/security/cacerts" ]) - execute(["keytool -list -v -storepass changeit"]) + execute([ + :keytool, '-list', '-v', + '-storepass changeit', + '-keystore', "#{ENV['JAVA_HOME']}/jre/lib/security/cacerts" + ]) end end end diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index cfb570e..881fa37 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.7.6' + VERSION = '3.8.0' end end -- cgit v1.2.3