diff options
| author | Josh Spicer <joshspicer@github.com> | 2022-06-03 17:46:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 17:46:25 +0300 |
| commit | c12a205ab8e195541acfe0cb654b4888e16ea05c (patch) | |
| tree | a1a45ac7dec9f31fa62972a65414b6d6fd1fd60d /src/java | |
| parent | 283b8e1f8f5dec9e54199c107e772ce56683769e (diff) | |
Pass options via environment variables (#39)
* up to docker-in-docker converted
* first pass at the rest of the features (and bash linting and updated CLI
* move shell linter to own file
* rename feature.json -> devcontainer-feature.json
* continue on error
* continue on error in right spot
* formatting
* fix AZ_VERSION
* update python
* restore variable name
* update linter actions, fix dind/dfd/desktop scripts, add test-scenaerios
* add tree because I like tree
* glob for shell linter
* fix test-scenarios
* shell linter
* more shell helper
Diffstat (limited to 'src/java')
| -rw-r--r-- | src/java/devcontainer-feature.json (renamed from src/java/feature.json) | 0 | ||||
| -rw-r--r-- | src/java/install.sh | 11 | ||||
| -rw-r--r-- | src/java/wrapper.sh | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/java/feature.json b/src/java/devcontainer-feature.json index 64d5d65..64d5d65 100644 --- a/src/java/feature.json +++ b/src/java/devcontainer-feature.json diff --git a/src/java/install.sh b/src/java/install.sh index f5880cd..7918568 100644 --- a/src/java/install.sh +++ b/src/java/install.sh @@ -9,10 +9,11 @@ # # Syntax: ./java-debian.sh [JDK version] [SDKMAN_DIR] [non-root user] [Add to rc files flag] -JAVA_VERSION=${1:-"lts"} -export SDKMAN_DIR=${2:-"/usr/local/sdkman"} -USERNAME=${3:-"automatic"} -UPDATE_RC=${4:-"true"} +JAVA_VERSION=${VERSION:-"lts"} + +export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"} +USERNAME=${USERNAME:-"automatic"} +UPDATE_RC=${UPDATE_RC:-"true"} set -e @@ -30,7 +31,7 @@ chmod +x /etc/profile.d/00-restore-env.sh if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") - for CURRENT_USER in ${POSSIBLE_USERS[@]}; do + for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} break diff --git a/src/java/wrapper.sh b/src/java/wrapper.sh index 4d2aef3..d7f05de 100644 --- a/src/java/wrapper.sh +++ b/src/java/wrapper.sh @@ -27,7 +27,7 @@ if [ "${is_jdk_8}" = "true" ]; then # Determine the appropriate non-root user username="" possible_users=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") - for current_user in ${possible_users[@]}; do + for current_user in "${POSSIBLE_USERS[@]}"; do if id -u ${current_user} > /dev/null 2>&1; then username=${current_user} break |