Merge branch '37109-license-finder-5-11-1' into 'master'v2.2.0

Upgrade license finder to 5.11.1

See merge request gitlab-org/security-products/license-management!90

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[@]}