diff options
-rw-r--r-- | src/common-utils/main.sh | 2 | ||||
-rwxr-xr-x | src/desktop-lite/install.sh | 4 | ||||
-rwxr-xr-x | src/docker-in-docker/install.sh | 4 | ||||
-rwxr-xr-x | src/docker-outside-of-docker/install.sh | 6 | ||||
-rw-r--r-- | src/dotnet/install.sh | 4 | ||||
-rwxr-xr-x | src/git-lfs/install.sh | 2 | ||||
-rwxr-xr-x | src/git/install.sh | 2 | ||||
-rwxr-xr-x | src/github-cli/install.sh | 2 | ||||
-rwxr-xr-x | src/go/install.sh | 2 | ||||
-rwxr-xr-x | src/nix/install.sh | 2 | ||||
-rwxr-xr-x | src/nix/nix-entrypoint.sh | 2 | ||||
-rwxr-xr-x | src/nix/utils.sh | 2 | ||||
-rwxr-xr-x | src/python/install.sh | 2 | ||||
-rwxr-xr-x | src/ruby/install.sh | 2 | ||||
-rw-r--r-- | src/sshd/NOTES.md | 2 | ||||
-rwxr-xr-x | src/terraform/install.sh | 2 |
16 files changed, 21 insertions, 21 deletions
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh index 893f53a..c8541cd 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -292,7 +292,7 @@ chmod +x /etc/profile.d/00-restore-env.sh # Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME . /etc/os-release -# Get an adjusted ID independant of distro variants +# Get an adjusted ID independent of distro variants if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then ADJUSTED_ID="debian" elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh index ffd39d5..df4390e 100755 --- a/src/desktop-lite/install.sh +++ b/src/desktop-lite/install.sh @@ -176,7 +176,7 @@ export DEBIAN_FRONTEND=noninteractive apt_get_update -# On older Ubuntu, Tilix is in a PPA. on Debian strech its in backports. +# On older Ubuntu, Tilix is in a PPA. on Debian stretch its in backports. if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then . /etc/os-release if [ "${ID}" = "ubuntu" ]; then @@ -365,7 +365,7 @@ screen_geometry="\${VNC_RESOLUTION%*x*}" screen_depth="\${VNC_RESOLUTION##*x}" startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "tigervncserver \${DISPLAY} -geometry \${screen_geometry} -depth \${screen_depth} -rfbport ${VNC_PORT} -dpi \${VNC_DPI:-96} -localhost -desktop fluxbox -fg -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd" -# Spin up noVNC if installed and not runnning. +# Spin up noVNC if installed and not running. if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT} --vnc localhost:${VNC_PORT}" log "noVNC started." diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh index d351121..dff1139 100755 --- a/src/docker-in-docker/install.sh +++ b/src/docker-in-docker/install.sh @@ -137,7 +137,7 @@ export DEBIAN_FRONTEND=noninteractive # Fetch host/container arch. architecture="$(dpkg --print-architecture)" -# Check if distro is suppported +# Check if distro is supported if [ "${USE_MOBY}" = "true" ]; then # 'get_common_setting' allows attribute to be updated remotely get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES @@ -305,7 +305,7 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then rm -rf /var/lib/apt/lists/* exit 0 fi -echo "docker-init doesnt exist, adding..." +echo "docker-init doesn't exist, adding..." # Add user to the docker group if [ "${ENABLE_NONROOT_DOCKER}" = "true" ]; then diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh index 1307bfc..dc5a903 100755 --- a/src/docker-outside-of-docker/install.sh +++ b/src/docker-outside-of-docker/install.sh @@ -126,7 +126,7 @@ fi # Fetch host/container arch. architecture="$(dpkg --print-architecture)" -# Check if distro is suppported +# Check if distro is supported if [ "${USE_MOBY}" = "true" ]; then # 'get_common_setting' allows attribute to be updated remotely get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES @@ -209,7 +209,7 @@ else TARGET_COMPOSE_ARCH="x86_64" fi if [ "${TARGET_COMPOSE_ARCH}" != "x86_64" ]; then - # Use pip to get a version that runns on this architecture + # Use pip to get a version that runs on this architecture check_packages python3-minimal python3-pip libffi-dev python3-venv export PIPX_HOME=/usr/local/pipx mkdir -p ${PIPX_HOME} @@ -260,7 +260,7 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then rm -rf /var/lib/apt/lists/* exit 0 fi -echo "docker-init doesnt exist, adding..." +echo "docker-init doesn't exist, adding..." # By default, make the source and target sockets the same if [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ]; then diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh index 13285ab..1c7430a 100644 --- a/src/dotnet/install.sh +++ b/src/dotnet/install.sh @@ -316,8 +316,8 @@ install_using_dotnet_releases_url() { local sdk_or_runtime="$1" local version="$2" - # Check listed package dependecies and install them if they are not already installed. - # NOTE: icu-devtools is a small package with similar dependecies to .NET. + # Check listed package dependencies and install them if they are not already installed. + # NOTE: icu-devtools is a small package with similar dependencies to .NET. # It will install the appropriate dependencies based on the OS: # - libgcc-s1 OR libgcc1 depending on OS # - the latest libicuXX depending on OS (eg libicu57 for stretch) diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh index f0ce9ff..d6f914f 100755 --- a/src/git-lfs/install.sh +++ b/src/git-lfs/install.sh @@ -65,7 +65,7 @@ find_version_from_git_tags() { receive_gpg_keys() { local keys=${!1} - # Use a temporary locaiton for gpg keys to avoid polluting image + # Use a temporary location for gpg keys to avoid polluting image export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/src/git/install.sh b/src/git/install.sh index 679e497..7bfa490 100755 --- a/src/git/install.sh +++ b/src/git/install.sh @@ -34,7 +34,7 @@ receive_gpg_keys() { keyring_args="--no-default-keyring --keyring $2" fi - # Use a temporary locaiton for gpg keys to avoid polluting image + # Use a temporary location for gpg keys to avoid polluting image export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh index 1856115..c1dd692 100755 --- a/src/github-cli/install.sh +++ b/src/github-cli/install.sh @@ -34,7 +34,7 @@ receive_gpg_keys() { keyring_args="--no-default-keyring --keyring $2" fi - # Use a temporary locaiton for gpg keys to avoid polluting image + # Use a temporary location for gpg keys to avoid polluting image export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/src/go/install.sh b/src/go/install.sh index 1b65e50..365421e 100755 --- a/src/go/install.sh +++ b/src/go/install.sh @@ -144,7 +144,7 @@ usermod -a -G golang "${USERNAME}" mkdir -p "${TARGET_GOROOT}" "${TARGET_GOPATH}" if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version)" != *"${TARGET_GO_VERSION}"* ]]; then - # Use a temporary locaiton for gpg keys to avoid polluting image + # Use a temporary location for gpg keys to avoid polluting image export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/src/nix/install.sh b/src/nix/install.sh index dcddcfd..80f9ace 100755 --- a/src/nix/install.sh +++ b/src/nix/install.sh @@ -12,7 +12,7 @@ FLAKEURI="${FLAKEURI:-""}" EXTRANIXCONFIG="${EXTRANIXCONFIG:-""}" USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" -# Nix keys for securly verifying installer download signature per https://nixos.org/download.html#nix-verify-installation +# Nix keys for securely verifying installer download signature per https://nixos.org/download.html#nix-verify-installation NIX_GPG_KEYS="B541D55301270E0BCF15CA5D8170B4726D7198DE" GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com keyserver hkps://keys.openpgp.org diff --git a/src/nix/nix-entrypoint.sh b/src/nix/nix-entrypoint.sh index cac3e63..0ec7188 100755 --- a/src/nix/nix-entrypoint.sh +++ b/src/nix/nix-entrypoint.sh @@ -15,7 +15,7 @@ if ! pidof nix-daemon > /dev/null 2>&1; then fi fi if [ "${start_ok}" = "false" ]; then - echo -e 'Failed to start nix-daemon as root. Set multiUser to false in your feature configuraiton if you would\nprefer to run the container as a non-root. You may also start the daemon manually if you have sudo\ninstalled and configured for your user by running "sudo -c nix-daemon &"' + echo -e 'Failed to start nix-daemon as root. Set multiUser to false in your feature configuration if you would\nprefer to run the container as a non-root. You may also start the daemon manually if you have sudo\ninstalled and configured for your user by running "sudo -c nix-daemon &"' fi fi exec "$@" diff --git a/src/nix/utils.sh b/src/nix/utils.sh index 5753e5a..7cb55f2 100755 --- a/src/nix/utils.sh +++ b/src/nix/utils.sh @@ -91,7 +91,7 @@ receive_gpg_keys() { keyring_args="--no-default-keyring --keyring $2" fi - # Use a temporary locaiton for gpg keys to avoid polluting image + # Use a temporary location for gpg keys to avoid polluting image export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/src/python/install.sh b/src/python/install.sh index 92b8368..3f6b4d9 100755 --- a/src/python/install.sh +++ b/src/python/install.sh @@ -85,7 +85,7 @@ receive_gpg_keys() { keyring_args="--no-default-keyring --keyring $2" fi - # Use a temporary locaiton for gpg keys to avoid polluting image + # Use a temporary location for gpg keys to avoid polluting image export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/src/ruby/install.sh b/src/ruby/install.sh index c879dec..daae7fa 100755 --- a/src/ruby/install.sh +++ b/src/ruby/install.sh @@ -78,7 +78,7 @@ receive_gpg_keys() { keyring_args="--no-default-keyring --keyring \"$2\"" fi - # Use a temporary locaiton for gpg keys to avoid polluting image + # Use a temporary location for gpg keys to avoid polluting image export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/src/sshd/NOTES.md b/src/sshd/NOTES.md index e0e7acc..c2ca8c8 100644 --- a/src/sshd/NOTES.md +++ b/src/sshd/NOTES.md @@ -57,7 +57,7 @@ While the some services automates SSH setup (e.g., when using the GitHub CLI for ``` \\sshfs.r\vscode@localhost!2222\workspaces ``` - ...where `vscode` above is the user you are running as in the container and `2222` after the `!` is the same local port you used in the `ssh` command in the previous seciton. + ...where `vscode` above is the user you are running as in the container and `2222` after the `!` is the same local port you used in the `ssh` command in the previous section. 4. Your dev container's filesystem should now be available in the `~/sshfs/devcontainer` folder on macOS or Linux or in a new explorer window on Windows. diff --git a/src/terraform/install.sh b/src/terraform/install.sh index b324eb6..1fec756 100755 --- a/src/terraform/install.sh +++ b/src/terraform/install.sh @@ -52,7 +52,7 @@ receive_gpg_keys() { keyring_args="--no-default-keyring --keyring $2" fi - # Use a temporary locaiton for gpg keys to avoid polluting image + # Use a temporary location for gpg keys to avoid polluting image export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} |