summaryrefslogtreecommitdiff
path: root/run.sh
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2019-12-06 14:37:47 -0700
committermo khan <mo.khan@gmail.com>2019-12-11 15:37:12 -0700
commitf3336b082bf2c8de049f78449efb7fec24e0c9ba (patch)
treecbc0093ed1113b8347d73618660d94b150477d61 /run.sh
parent1decc44a7ae62d9bc713c7b9696638a5be1df563 (diff)
Upgrade license_finder to 5.11.1
* Run newest report version first * Change default license finder version to latest * Use --recursive for .NET projects * Update paths in c# test fixtures * Use login shell to source rvm * Tell license finder the version of python to use * Add Changelog entry
Diffstat (limited to 'run.sh')
-rwxr-xr-xrun.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/run.sh b/run.sh
index 30d1eff..096447b 100755
--- a/run.sh
+++ b/run.sh
@@ -69,11 +69,13 @@ fi
case "$LM_PYTHON_VERSION" in
"2"|"2.7")
echo "using python $LM_PYTHON_VERSION"
+ LICENSE_FINDER_CLI_OPTS="--python-version 2 $LICENSE_FINDER_CLI_OPTS"
pip --version
;;
"3"|"3.5")
echo "switching to python $LM_PYTHON_VERSION"
+ LICENSE_FINDER_CLI_OPTS="--python-version 3 $LICENSE_FINDER_CLI_OPTS"
pip3 install --upgrade --no-index -f "file://$LOCAL_PYPI_INDEX" "pip==$VERSION_OF_PIP"
update-alternatives --install /usr/bin/python python /usr/bin/python3.5 1
pip --version
@@ -172,6 +174,9 @@ case "$COMMAND" in
gradle build
skip_prepare=true
fi
+ if [[ $(ls ./*.sln 2> /dev/null) ]]; then
+ LICENSE_FINDER_CLI_OPTS="--recursive $LICENSE_FINDER_CLI_OPTS"
+ fi
else
echo "Running '${SETUP_CMD[@]}' to install project dependencies..."
${SETUP_CMD[@]}