aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamruddhi Khandale <skhandale@microsoft.com>2022-05-12 00:07:19 +0300
committerGitHub <noreply@github.com>2022-05-12 00:07:19 +0300
commit72c8ec81af65c30657a38becb6856e99e1c3b324 (patch)
tree3bae0d8f7575c7c793d8e1442b44fbfc5d2b0544
parente35e92e44cf8dbfb877d1923686d2bf333d95895 (diff)
Java: Fix file not found bug (#6)
java-fix file not found bug
-rw-r--r--collection/java/wrapper.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/collection/java/wrapper.sh b/collection/java/wrapper.sh
index c48e7d9..4d2aef3 100644
--- a/collection/java/wrapper.sh
+++ b/collection/java/wrapper.sh
@@ -10,7 +10,7 @@ UPDATE_RC=${4:-"true"}
ADDITIONAL_JAVA_VERSION=11
cd "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-chmod +x java-debian.sh
+chmod +x install.sh
is_jdk_8="false"
if echo "${JAVA_VERSION}" | grep -E '^8([\s\.]|$)' > /dev/null 2>&1; then
@@ -20,7 +20,7 @@ fi
# If the user selected JDK 8, install the JDK 11 as well since this is needed by the Java extension
if [ "${is_jdk_8}" = "true" ]; then
echo "(*) Installing JDK ${ADDITIONAL_JAVA_VERSION} as Java VS Code extension requires a recent JDK..."
- ./java-debian.sh "${ADDITIONAL_JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
+ ./install.sh "${ADDITIONAL_JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
jdk_11_folder="$(ls --format=single-column ${SDKMAN_DIR}/candidates/java | grep -oE -m 1 '11\..+')"
ln -s "${SDKMAN_DIR}/candidates/java/${jdk_11_folder}" /extension-java-home
@@ -41,7 +41,7 @@ else
fi
echo "(*) Installing JDK ${JAVA_VERSION}..."
-./java-debian.sh "${JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
+./install.sh "${JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
if [ "${is_jdk_8}" = "true" ]; then
# Set current and default version to last SDK installed
jdk_full_version="$(ls --format=single-column "${SDKMAN_DIR}/candidates/java" | sort -rV | grep -oE -m 1 "${JAVA_VERSION}\\..+" )"