From 4e97f1900e25cd212481f43d27bf3ebeaa2420f1 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 5 Mar 2020 14:30:21 -0700
Subject: Extract default env vars

---
 run.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'run.sh')

diff --git a/run.sh b/run.sh
index 53e9215..beae705 100755
--- a/run.sh
+++ b/run.sh
@@ -9,8 +9,9 @@ export BUNDLE_WITHOUT="development test"
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export HISTFILESIZE=0
 export HISTSIZE=0
+export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:-'--no-debug'}
 export LICENSE_FINDER_PYTHON_VERSION="--python-version=3"
-export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:-'--debug'}
+export LM_REPORT_FILE='gl-license-management-report.json'
 export PREPARE="--prepare-no-fail"
 export RUBY_GC_HEAP_INIT_SLOTS=800000
 export RUBY_GC_MALLOC_LIMIT=79000000
@@ -18,7 +19,7 @@ export RUBY_HEAP_FREE_MIN=100000
 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 export RUBY_HEAP_SLOTS_INCREMENT=400000
 
-if [ -n "$LM_PYTHON_VERSION" ]; then
+if [[ -n ${LM_PYTHON_VERSION:-} ]]; then
   MAJOR_VERSION=$(echo "$LM_PYTHON_VERSION" | cut -d'.' -f1)
   switch_to python "$MAJOR_VERSION"
   python --version
@@ -34,7 +35,6 @@ function debug_env() {
   pwd
   ls -alh
   env | sort
-  asdf list
   asdf current
   ruby -v
   gem --version
@@ -46,11 +46,9 @@ function scan_project() {
   gem install --quiet --silent "$LM_HOME/*.gem"
   license_management ignored_groups add development
   license_management ignored_groups add test
-  options=("${prepare}" '--format=json' '--save=gl-license-management-report.json' "${LICENSE_FINDER_PYTHON_VERSION}" "${LICENSE_FINDER_CLI_OPTS}")
+  options=("${prepare}" '--format=json' "--save=${LM_REPORT_FILE}" "${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() {
@@ -58,12 +56,13 @@ function prepare_javascript() {
     if [ -f package-lock.json ] && [ ! -f yarn.lock ] ; then
       echo "Installing npm packages with npm ci"
       npm ci
+      PREPARE="--no-prepare"
     fi
     if [ ! -d node_modules ]; then
       echo "Installing yarn packages"
       yarn install --ignore-engines --ignore-scripts
+      PREPARE="--no-prepare"
     fi
-    PREPARE="--no-prepare"
   fi
 }
 
-- 
cgit v1.2.3