Unverified Commit 58b8fe09 authored by Samruddhi Khandale's avatar Samruddhi Khandale Committed by GitHub

Fix typos in comments / *.md (#396)

parent 79588ef3
...@@ -292,7 +292,7 @@ chmod +x /etc/profile.d/00-restore-env.sh ...@@ -292,7 +292,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME # Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
. /etc/os-release . /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 if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
ADJUSTED_ID="debian" ADJUSTED_ID="debian"
elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
......
...@@ -176,7 +176,7 @@ export DEBIAN_FRONTEND=noninteractive ...@@ -176,7 +176,7 @@ export DEBIAN_FRONTEND=noninteractive
apt_get_update 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 if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
. /etc/os-release . /etc/os-release
if [ "${ID}" = "ubuntu" ]; then if [ "${ID}" = "ubuntu" ]; then
...@@ -365,7 +365,7 @@ screen_geometry="\${VNC_RESOLUTION%*x*}" ...@@ -365,7 +365,7 @@ screen_geometry="\${VNC_RESOLUTION%*x*}"
screen_depth="\${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" 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 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}" keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT} --vnc localhost:${VNC_PORT}"
log "noVNC started." log "noVNC started."
......
...@@ -137,7 +137,7 @@ export DEBIAN_FRONTEND=noninteractive ...@@ -137,7 +137,7 @@ export DEBIAN_FRONTEND=noninteractive
# Fetch host/container arch. # Fetch host/container arch.
architecture="$(dpkg --print-architecture)" architecture="$(dpkg --print-architecture)"
# Check if distro is suppported # Check if distro is supported
if [ "${USE_MOBY}" = "true" ]; then if [ "${USE_MOBY}" = "true" ]; then
# 'get_common_setting' allows attribute to be updated remotely # 'get_common_setting' allows attribute to be updated remotely
get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
...@@ -305,7 +305,7 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then ...@@ -305,7 +305,7 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
exit 0 exit 0
fi fi
echo "docker-init doesnt exist, adding..." echo "docker-init doesn't exist, adding..."
# Add user to the docker group # Add user to the docker group
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ]; then if [ "${ENABLE_NONROOT_DOCKER}" = "true" ]; then
......
...@@ -126,7 +126,7 @@ fi ...@@ -126,7 +126,7 @@ fi
# Fetch host/container arch. # Fetch host/container arch.
architecture="$(dpkg --print-architecture)" architecture="$(dpkg --print-architecture)"
# Check if distro is suppported # Check if distro is supported
if [ "${USE_MOBY}" = "true" ]; then if [ "${USE_MOBY}" = "true" ]; then
# 'get_common_setting' allows attribute to be updated remotely # 'get_common_setting' allows attribute to be updated remotely
get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
...@@ -209,7 +209,7 @@ else ...@@ -209,7 +209,7 @@ else
TARGET_COMPOSE_ARCH="x86_64" TARGET_COMPOSE_ARCH="x86_64"
fi fi
if [ "${TARGET_COMPOSE_ARCH}" != "x86_64" ]; then 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 check_packages python3-minimal python3-pip libffi-dev python3-venv
export PIPX_HOME=/usr/local/pipx export PIPX_HOME=/usr/local/pipx
mkdir -p ${PIPX_HOME} mkdir -p ${PIPX_HOME}
...@@ -260,7 +260,7 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then ...@@ -260,7 +260,7 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
exit 0 exit 0
fi fi
echo "docker-init doesnt exist, adding..." echo "docker-init doesn't exist, adding..."
# By default, make the source and target sockets the same # By default, make the source and target sockets the same
if [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ]; then if [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ]; then
......
...@@ -316,8 +316,8 @@ install_using_dotnet_releases_url() { ...@@ -316,8 +316,8 @@ install_using_dotnet_releases_url() {
local sdk_or_runtime="$1" local sdk_or_runtime="$1"
local version="$2" local version="$2"
# Check listed package dependecies and install them if they are not already installed. # Check listed package dependencies and install them if they are not already installed.
# NOTE: icu-devtools is a small package with similar dependecies to .NET. # NOTE: icu-devtools is a small package with similar dependencies to .NET.
# It will install the appropriate dependencies based on the OS: # It will install the appropriate dependencies based on the OS:
# - libgcc-s1 OR libgcc1 depending on OS # - libgcc-s1 OR libgcc1 depending on OS
# - the latest libicuXX depending on OS (eg libicu57 for stretch) # - the latest libicuXX depending on OS (eg libicu57 for stretch)
......
...@@ -65,7 +65,7 @@ find_version_from_git_tags() { ...@@ -65,7 +65,7 @@ find_version_from_git_tags() {
receive_gpg_keys() { receive_gpg_keys() {
local keys=${!1} 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" export GNUPGHOME="/tmp/tmp-gnupg"
mkdir -p ${GNUPGHOME} mkdir -p ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
......
...@@ -34,7 +34,7 @@ receive_gpg_keys() { ...@@ -34,7 +34,7 @@ receive_gpg_keys() {
keyring_args="--no-default-keyring --keyring $2" keyring_args="--no-default-keyring --keyring $2"
fi 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" export GNUPGHOME="/tmp/tmp-gnupg"
mkdir -p ${GNUPGHOME} mkdir -p ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
......
...@@ -34,7 +34,7 @@ receive_gpg_keys() { ...@@ -34,7 +34,7 @@ receive_gpg_keys() {
keyring_args="--no-default-keyring --keyring $2" keyring_args="--no-default-keyring --keyring $2"
fi 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" export GNUPGHOME="/tmp/tmp-gnupg"
mkdir -p ${GNUPGHOME} mkdir -p ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
......
...@@ -144,7 +144,7 @@ usermod -a -G golang "${USERNAME}" ...@@ -144,7 +144,7 @@ usermod -a -G golang "${USERNAME}"
mkdir -p "${TARGET_GOROOT}" "${TARGET_GOPATH}" mkdir -p "${TARGET_GOROOT}" "${TARGET_GOPATH}"
if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version)" != *"${TARGET_GO_VERSION}"* ]]; then 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" export GNUPGHOME="/tmp/tmp-gnupg"
mkdir -p ${GNUPGHOME} mkdir -p ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
......
...@@ -12,7 +12,7 @@ FLAKEURI="${FLAKEURI:-""}" ...@@ -12,7 +12,7 @@ FLAKEURI="${FLAKEURI:-""}"
EXTRANIXCONFIG="${EXTRANIXCONFIG:-""}" EXTRANIXCONFIG="${EXTRANIXCONFIG:-""}"
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" 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" NIX_GPG_KEYS="B541D55301270E0BCF15CA5D8170B4726D7198DE"
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
keyserver hkps://keys.openpgp.org keyserver hkps://keys.openpgp.org
......
...@@ -15,7 +15,7 @@ if ! pidof nix-daemon > /dev/null 2>&1; then ...@@ -15,7 +15,7 @@ if ! pidof nix-daemon > /dev/null 2>&1; then
fi fi
fi fi
if [ "${start_ok}" = "false" ]; then 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
fi fi
exec "$@" exec "$@"
...@@ -91,7 +91,7 @@ receive_gpg_keys() { ...@@ -91,7 +91,7 @@ receive_gpg_keys() {
keyring_args="--no-default-keyring --keyring $2" keyring_args="--no-default-keyring --keyring $2"
fi 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" export GNUPGHOME="/tmp/tmp-gnupg"
mkdir -p ${GNUPGHOME} mkdir -p ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
......
...@@ -85,7 +85,7 @@ receive_gpg_keys() { ...@@ -85,7 +85,7 @@ receive_gpg_keys() {
keyring_args="--no-default-keyring --keyring $2" keyring_args="--no-default-keyring --keyring $2"
fi 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" export GNUPGHOME="/tmp/tmp-gnupg"
mkdir -p ${GNUPGHOME} mkdir -p ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
......
...@@ -78,7 +78,7 @@ receive_gpg_keys() { ...@@ -78,7 +78,7 @@ receive_gpg_keys() {
keyring_args="--no-default-keyring --keyring \"$2\"" keyring_args="--no-default-keyring --keyring \"$2\""
fi 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" export GNUPGHOME="/tmp/tmp-gnupg"
mkdir -p ${GNUPGHOME} mkdir -p ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
......
...@@ -57,7 +57,7 @@ While the some services automates SSH setup (e.g., when using the GitHub CLI for ...@@ -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 \\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. 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.
......
...@@ -52,7 +52,7 @@ receive_gpg_keys() { ...@@ -52,7 +52,7 @@ receive_gpg_keys() {
keyring_args="--no-default-keyring --keyring $2" keyring_args="--no-default-keyring --keyring $2"
fi 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" export GNUPGHOME="/tmp/tmp-gnupg"
mkdir -p ${GNUPGHOME} mkdir -p ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment