Skip to content

Commit 2eecb71

Browse files
Copilotabdurriq
authored andcommitted
Update java wrapper.sh to use common-setup.sh helper
1 parent 9b63ddf commit 2eecb71

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

src/java/wrapper.sh

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,9 @@ if [ "${is_jdk_8}" = "true" ]; then
2424
jdk_11_folder="$(ls --format=single-column ${SDKMAN_DIR}/candidates/java | grep -oE -m 1 '11\..+')"
2525
ln -s "${SDKMAN_DIR}/candidates/java/${jdk_11_folder}" /extension-java-home
2626

27-
# Determine the appropriate non-root user
28-
username=""
29-
possible_users=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
30-
for current_user in "${POSSIBLE_USERS[@]}"; do
31-
if id -u ${current_user} > /dev/null 2>&1; then
32-
username=${current_user}
33-
break
34-
fi
35-
done
36-
if [ "${username}" = "" ]; then
37-
username=root
38-
fi
27+
# Source common helper functions to determine the appropriate non-root user
28+
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../_common/common-setup.sh"
29+
username=$(determine_user_from_input "${USERNAME}" "root")
3930
else
4031
ln -s ${SDKMAN_DIR}/candidates/java/current /extension-java-home
4132
fi

0 commit comments

Comments
 (0)