From d1972b4d8d2dc75370c236c9dafe505ea42590f2 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Mon, 28 Nov 2022 17:07:38 -0600 Subject: Use _REMOTE_USER when available (#264) * Use _REMOTE_USER when available * Update src/python/install.sh Co-authored-by: Samruddhi Khandale * Update src/python/install.sh Co-authored-by: Samruddhi Khandale * Fix java test issue - JDK 18 not available for the "open" distro * Bump breakfix numbers Co-authored-by: Samruddhi Khandale Co-authored-by: Josh Spicer --- src/java/install.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) mode change 100755 => 100644 src/java/install.sh (limited to 'src/java/install.sh') diff --git a/src/java/install.sh b/src/java/install.sh old mode 100755 new mode 100644 index 5928478..bf94963 --- a/src/java/install.sh +++ b/src/java/install.sh @@ -9,20 +9,20 @@ # # Syntax: ./java-debian.sh [JDK version] [SDKMAN_DIR] [non-root user] [Add to rc files flag] -JAVA_VERSION=${VERSION:-"lts"} -INSTALL_GRADLE=${INSTALLGRADLE:-"false"} -GRADLE_VERSION=${GRADLEVERSION:-"latest"} -INSTALL_MAVEN=${INSTALLMAVEN:-"false"} -MAVEN_VERSION=${MAVENVERSION:-"latest"} -JDK_DISTRO=${JDKDISTRO} +JAVA_VERSION="${VERSION:-"lts"}" +INSTALL_GRADLE="${INSTALLGRADLE:-"false"}" +GRADLE_VERSION="${GRADLEVERSION:-"latest"}" +INSTALL_MAVEN="${INSTALLMAVEN:-"false"}" +MAVEN_VERSION="${MAVENVERSION:-"latest"}" +JDK_DISTRO="${JDKDISTRO}" -export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"} -USERNAME=${USERNAME:-"automatic"} -UPDATE_RC=${UPDATE_RC:-"true"} +export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}" +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" +UPDATE_RC="${UPDATE_RC:-"true"}" # Comma-separated list of java versions to be installed # alongside JAVA_VERSION, but not set as default. -ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""} +ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}" set -e -- cgit v1.2.3