diff options
| -rw-r--r-- | lib/license/management/report.rb | 2 | ||||
| -rwxr-xr-x | run.sh | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/license/management/report.rb b/lib/license/management/report.rb index 6acfb67..b1bf9ed 100644 --- a/lib/license/management/report.rb +++ b/lib/license/management/report.rb @@ -22,7 +22,7 @@ module License # This method overrides the method defined in `LicenseFinder::JsonReport` to # allow us to generate a custom json report. def to_s - JSON.pretty_generate(version_for(report_version).to_h) + "\n" + JSON.pretty_generate(version_for(report_version).to_h) end private @@ -15,6 +15,7 @@ export RUBY_HEAP_FREE_MIN=100000 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1 export RUBY_HEAP_SLOTS_INCREMENT=400000 export PREPARE="--prepare-no-fail" +export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-3} if [ -n "$LM_PYTHON_VERSION" ]; then MAJOR_VERSION=$(echo "$LM_PYTHON_VERSION" | cut -d'.' -f1) @@ -30,6 +31,7 @@ switch_to java "adopt-openjdk-${LM_JAVA_VERSION:-8}" function debug_env() { pwd + ls -alh env | sort asdf list asdf current @@ -40,14 +42,16 @@ function debug_env() { function scan_project() { prepare="$1" - gem install "$LM_HOME/*.gem" + gem install --quiet --silent "$LM_HOME/*.gem" license_management ignored_groups add development license_management ignored_groups add test - LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:-'--no-quiet'} + LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:-'--debug'} LICENSE_FINDER_PYTHON_VERSION=${LICENSE_FINDER_PYTHON_VERSION:-'--python-version=3'} options=("${prepare}" '--format=json' '--save=gl-license-management-report.json' "${LICENSE_FINDER_PYTHON_VERSION}" "${LICENSE_FINDER_CLI_OPTS}") echo license_management report "${options[@]}" license_management report "${options[@]}" + bundle list + cat gl-license-management-report.json } function prepare_javascript() { @@ -97,7 +101,7 @@ function prepare_dotnet() { function prepare_project() { project_path=$1 cd "$project_path" - if [[ -z "${SETUP_CMD}" ]]; then + if [[ -z "${SETUP_CMD-}" ]]; then asdf install prepare_javascript prepare_golang |