summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-03-07 13:01:30 -0700
committermo khan <mo.khan@gmail.com>2020-03-07 13:01:30 -0700
commit931653ff41cf5b645a14f59f93fcc7651b9906cb (patch)
treec1dcb36ad63eab65261ae9f96a6b2cdcf4e312d1
parent727342516f4dcdaf1ef9a1f305b1f1d086b6516e (diff)
Fix BUNDLE_PATH conflict.
BUNDLE_PATH is hard coded [here](https://github.com/pivotal/LicenseFinder/blob/e91798fd82c127f3d9e7d844600886853a41b6c3/lib/license_finder/package_managers/bundler.rb#L42)
-rwxr-xr-xrun.sh16
1 files changed, 5 insertions, 11 deletions
diff --git a/run.sh b/run.sh
index c9ce173..c919246 100755
--- a/run.sh
+++ b/run.sh
@@ -1,10 +1,9 @@
#!/bin/bash -l
-set -exuo pipefail
+set -euo pipefail
BUNDLE_JOBS="$(nproc)"
export BUNDLE_JOBS
-export BUNDLE_PATH="vendor/bundle"
export BUNDLE_WITHOUT="development:test"
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export HISTFILESIZE=0
@@ -25,13 +24,11 @@ function debug_env() {
env | sort
asdf current
- # ruby
ruby -v
gem --version
bundle --version
bundle config
- # python
python --version
pip --version
}
@@ -44,10 +41,6 @@ function scan_project() {
license_management report "$@"
}
-function prepare_ruby() {
- [[ -f Gemfile ]] && bundle install
-}
-
function prepare_javascript() {
if [ -f package.json ]; then
[[ -f package-lock.json ]] && [[ ! -f yarn.lock ]] && npm ci
@@ -69,11 +62,13 @@ function prepare_golang() {
function prepare_java() {
[[ -f pom.xml ]] && mvn install "${MAVEN_CLI_OPTS:--DskipTests}"
- [[ -f build.gradle ]] && [[ ! -f gradlew ]] && gradle build ${GRADLE_CLI_OPTS:+-x test}
+ [[ -f build.gradle ]] && [[ ! -f gradlew ]] && \
+ gradle build ${GRADLE_CLI_OPTS:+-x test}
}
function prepare_dotnet() {
- [[ $(ls ./*.sln 2> /dev/null) ]] && LICENSE_FINDER_CLI_OPTS="--recursive=true $LICENSE_FINDER_CLI_OPTS"
+ [[ $(ls ./*.sln 2> /dev/null) ]] && \
+ LICENSE_FINDER_CLI_OPTS="--recursive=true $LICENSE_FINDER_CLI_OPTS"
}
function prepare_project() {
@@ -81,7 +76,6 @@ function prepare_project() {
if [[ -z ${SETUP_CMD:-} ]]; then
asdf install
- prepare_ruby || true
prepare_javascript || true
prepare_golang || true
prepare_java || true