diff options
| author | mo khan <mo.khan@gmail.com> | 2020-03-03 14:35:29 -0700 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-03-03 14:35:29 -0700 |
| commit | 7c03454f5e9c9a3afdfd31e9afeedf307e776c4c (patch) | |
| tree | 1f9e31bf5478566bfc6a09096bce1af323050c94 | |
| parent | 074b2675d7c592d060b98cebb53bbff6fabc6794 (diff) | |
Use a separate variable to control the python version
| -rw-r--r-- | config/.bashrc | 4 | ||||
| -rwxr-xr-x | run.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/.bashrc b/config/.bashrc index 01452ee..7bd45c1 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -49,9 +49,9 @@ if [ -n "$LM_PYTHON_VERSION" ]; then switch_to python "$MAJOR_VERSION" python --version pip --version - export LICENSE_FINDER_CLI_OPTS="--python-version $MAJOR_VERSION $LICENSE_FINDER_CLI_OPTS" + export LICENSE_FINDER_PYTHON_VERSION="--python-version $MAJOR_VERSION" else - export LICENSE_FINDER_CLI_OPTS="--python-version 3 $LICENSE_FINDER_CLI_OPTS" + export LICENSE_FINDER_PYTHON_VERSION="--python-version 3" fi switch_to java "adopt-openjdk-${LM_JAVA_VERSION:-8}" @@ -126,7 +126,7 @@ case "$COMMAND" in license_management ignored_groups add development license_management ignored_groups add test echo "Preparing JSON report..." - license_management report ${prepare} --format=json --save=gl-license-management-report.json "${LICENSE_FINDER_CLI_OPTS}" + license_management report ${prepare} --format=json --save=gl-license-management-report.json "${LICENSE_FINDER_PYTHON_VERSION}" "${LICENSE_FINDER_CLI_OPTS}" popd > /dev/null ;; |