diff options
Diffstat (limited to 'src/desktop-lite')
| -rw-r--r-- | src/desktop-lite/devcontainer-feature.json (renamed from src/desktop-lite/feature.json) | 36 | ||||
| -rw-r--r-- | src/desktop-lite/install.sh | 18 |
2 files changed, 36 insertions, 18 deletions
diff --git a/src/desktop-lite/feature.json b/src/desktop-lite/devcontainer-feature.json index 4ad8b8d..fa7649c 100644 --- a/src/desktop-lite/feature.json +++ b/src/desktop-lite/devcontainer-feature.json @@ -4,25 +4,43 @@ "options": { "version": { "type": "string", - "enum": ["latest"], + "proposals": [ + "latest" + ], "default": "latest", - "description": "Currently unused." + "description": "Currently Unused!" }, - "password": { + "novnc_version": { "type": "string", - "proposals": ["vscode","codespaces","password"], + "proposals": [ + "1.2.0" + ], + "default": "1.2.0", + "description": "NoVnc Version" + }, + "vnc_password": { + "type": "string", + "proposals": [ + "vscode", + "codespaces", + "password" + ], "default": "vscode", "description": "Enter a password for desktop connections" }, - "webPort": { + "novnc_port": { "type": "string", - "proposals": ["6080"], + "proposals": [ + "6080" + ], "default": "6080", - "description": "Enter a port for the desktop web client" + "description": "Enter a port for the VNC web client" }, - "vncPort": { + "vnc_port": { "type": "string", - "proposals": ["5901"], + "proposals": [ + "5901" + ], "default": "5901", "description": "Enter a port for the desktop VNC server" } 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 |