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/desktop-lite/install.sh | |
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/desktop-lite/install.sh')
-rw-r--r-- | src/desktop-lite/install.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh index ac149c4..e9f74f1 100644 --- a/src/desktop-lite/install.sh +++ b/src/desktop-lite/install.sh @@ -6,16 +6,16 @@ # # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/desktop-lite.md # Maintainer: The VS Code and Codespaces Teams -# -# Syntax: ./desktop-lite-debian.sh [non-root user] [Desktop password] [Install web client flag] [VNC port] [Web Port] -USERNAME=${1:-"automatic"} -VNC_PASSWORD=${2:-"vscode"} -INSTALL_NOVNC=${3:-"true"} -VNC_PORT="${4:-5901}" -NOVNC_PORT="${5:-6080}" +NOVNC_VERSION=${NOVNC_VERSION:-"1.2.0"} # TODO: Add in a 'latest' auto-detect and swap name to 'version' +VNC_PASSWORD=${VNC_PASSWORD:-"vscode"} +NOVNC_PORT="${NOVNC_PORT:-6080}" +VNC_PORT="${VNC_PORT:-5901}" + +INSTALL_NOVNC=${INSTALL_NOVNC:-"true"} +USERNAME=${USERNAME:-"automatic"} + -NOVNC_VERSION=1.2.0 WEBSOCKETIFY_VERSION=0.10.0 package_list=" @@ -72,7 +72,7 @@ fi 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 |