Install tools from .deb package

1 files changed, 3 insertions, 40 deletions

diff --git a/run.sh b/run.sh
index b4d6bdd..c7eb446 100755
--- a/run.sh
+++ b/run.sh
@@ -6,8 +6,6 @@ set -e
 
 [[ -z ${SETUP_CMD:-} ]] && set -uo pipefail
 
-export ASDF_JAVA_VERSION="${ASDF_JAVA_VERSION:-}"
-export ASDF_PYTHON_VERSION="${ASDF_PYTHON_VERSION:-}"
 export CI_API_V4_URL="${CI_API_V4_URL:-https://gitlab.com/api/v4}"
 export DEBIAN_FRONTEND=noninteractive
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
@@ -17,8 +15,8 @@ export HISTFILESIZE=0
 export HISTSIZE=0
 export LANG=C.UTF-8
 export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:=--no-debug}
-export LM_JAVA_VERSION=${LM_JAVA_VERSION:-}
-export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-}
+export LM_JAVA_VERSION=${LM_JAVA_VERSION:-"8"}
+export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-"3"}
 export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-scanning-report.json'}
 export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:--DskipTests}"
 export NO_UPDATE_NOTIFIER=true
@@ -40,43 +38,8 @@ function scan_project() {
   license_management report $@
 }
 
-function prepare_java() {
-  if [ -n "$LM_JAVA_VERSION" ]; then
-    switch_to java "adoptopenjdk-${LM_JAVA_VERSION}"
-  elif [ -n "$ASDF_JAVA_VERSION" ]; then
-    switch_to_exact java "${ASDF_JAVA_VERSION//adopt-openjdk/adoptopenjdk}"
-  else
-    switch_to java "adoptopenjdk-8"
-  fi
-}
-
-function prepare_python() {
-  if [ -n "$LM_PYTHON_VERSION" ]; then
-    switch_to python "$(major_version_from "$LM_PYTHON_VERSION")"
-  elif [ -n "$ASDF_PYTHON_VERSION" ]; then
-    switch_to_exact python "$ASDF_PYTHON_VERSION"
-  else
-    switch_to python "3"
-  fi
-}
-
-function prepare_tools() {
-  dpkg -i /opt/toolcache/php*.deb || true
-  dpkg -i /opt/toolcache/rust*.deb || true
-
-  if ! asdf current 2> >(grep -q 'is not installed'); then
-    echo "Installing missing tools…"
-    asdf install
-  fi
-}
-
 function prepare_project() {
-  prepare_java
-  prepare_python
-
-  if [[ -z ${SETUP_CMD:-} ]]; then
-    prepare_tools || true
-  else
+  if [[ -n ${SETUP_CMD:-} ]]; then
     echo "Running '${SETUP_CMD}' to install project dependencies…"
     # shellcheck disable=SC2068
     ${SETUP_CMD[@]}