diff options
| -rw-r--r-- | src/common-utils/devcontainer-feature.json | 2 | ||||
| -rwxr-xr-x | src/common-utils/install.sh | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index 240f6f8..e916135 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "1.1.1", + "version": "1.1.2", "name": "Common Debian Utilities", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils", "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.", diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh index 0d11532..1170200 100755 --- a/src/common-utils/install.sh +++ b/src/common-utils/install.sh @@ -17,9 +17,7 @@ USER_UID=${UID:-"automatic"} USER_GID=${GID:-"automatic"} ADD_NON_FREE_PACKAGES=${NONFREEPACKAGES:-"false"} -DEV_CONTAINERS_DIR="/usr/local/etc/vscode-dev-containers" -MARKER_FILE="${DEV_CONTAINERS_DIR}/common" - +MARKER_FILE="/usr/local/etc/vscode-dev-containers/common" if [ "$(id -u)" -ne 0 ]; then echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.' @@ -234,8 +232,8 @@ if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.loc # Display optional first run image specific notice if configured and terminal is interactive if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespaces" ]] && [ ! -f "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed" ]; then - if [ -f "${DEV_CONTAINERS_DIR}/first-run-notice.txt" ]; then - cat "${DEV_CONTAINERS_DIR}/first-run-notice.txt" + if [ -f "/usr/local/etc/vscode-dev-containers/first-run-notice.txt" ]; then + cat "/usr/local/etc/vscode-dev-containers/first-run-notice.txt" elif [ -f "/workspaces/.codespaces/shared/first-run-notice.txt" ]; then cat "/workspaces/.codespaces/shared/first-run-notice.txt" fi @@ -432,12 +430,12 @@ if [ ! -z "${CONTENTS_URL}" ]; then echo && echo "More info: ${CONTENTS_URL}"; f echo EOF )" -if [ -f "${DEV_CONTAINERS_DIR}/meta.env" ]; then +if [ -f "/usr/local/etc/vscode-dev-containers/meta.env" ]; then echo "${meta_info_script}" > /usr/local/bin/devcontainer-info chmod +x /usr/local/bin/devcontainer-info fi -if [ ! -d "${DEV_CONTAINERS_DIR}" ]; then +if [ ! -d "/usr/local/etc/vscode-dev-containers" ]; then mkdir -p "$(dirname "${MARKER_FILE}")" fi |