diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md index 1794d42e8..d89bc990e 100644 --- a/src/docker-outside-of-docker/README.md +++ b/src/docker-outside-of-docker/README.md @@ -3,7 +3,7 @@ # Docker (docker-outside-of-docker) (docker-outside-of-docker) -Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands. +Reuse the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands. ## Example Usage diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json index 7314fa83d..41f412df6 100644 --- a/src/docker-outside-of-docker/devcontainer-feature.json +++ b/src/docker-outside-of-docker/devcontainer-feature.json @@ -3,7 +3,7 @@ "version": "1.6.5", "name": "Docker (docker-outside-of-docker)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker", - "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.", + "description": "Reuse the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.", "options": { "version": { "type": "string", diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json index 4198af326..862c812a8 100644 --- a/src/java/devcontainer-feature.json +++ b/src/java/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "java", - "version": "1.6.3", + "version": "1.6.4", "name": "Java (via SDKMAN!)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java", "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.", diff --git a/src/java/install.sh b/src/java/install.sh index 62fd39462..6d2ad1efe 100644 --- a/src/java/install.sh +++ b/src/java/install.sh @@ -91,7 +91,7 @@ pkg_manager_update() { set +e stderr_messages=$(${PKG_MGR_CMD} -q check-update 2>&1) rc=$? - # centos 7 sometimes returns a status of 100 when it apears to work. + # centos 7 sometimes returns a status of 100 when it appears to work. if [ $rc != 0 ] && [ $rc != 100 ]; then echo "(Error) ${PKG_MGR_CMD} check-update produced the following error message(s):" echo "${stderr_messages}" @@ -202,17 +202,17 @@ find_version_list() { ifLts="$4" version_list=$5 java_ver=$6 - + check_packages jq all_versions=$(curl -s https://api.adoptium.net/v3/info/available_releases) - if [ "${ifLts}" = "true" ]; then + if [ "${ifLts}" = "true" ]; then major_version=$(echo "$all_versions" | jq -r '.most_recent_lts') elif [ "${java_ver}" = "latest" ]; then - major_version=$(echo "$all_versions" | jq -r '.most_recent_feature_release') + major_version=$(echo "$all_versions" | jq -r '.most_recent_feature_release') else major_version=$(echo "$java_ver" | cut -d '.' -f 1) fi - + # Remove the hardcoded fallback as this fails for new jdk latest version released ex: 24 # Related Issue: https://github.com/devcontainers/features/issues/1308 if [ "${JDK_DISTRO}" = "ms" ]; then @@ -255,7 +255,7 @@ sdk_install() { requested_version="$(echo "${version_list}" | head -n 1)" elif echo "${requested_version}" | grep -oE "${full_version_check}" > /dev/null 2>&1; then echo "${requested_version}" - else + else find_version_list "$prefix" "$suffix" "$install_type" "false" version_list "${requested_version}" if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then requested_version="$(echo "${version_list}" | head -n 1)" diff --git a/src/node/install.sh b/src/node/install.sh index 46d448440..64ec28b5c 100755 --- a/src/node/install.sh +++ b/src/node/install.sh @@ -132,7 +132,7 @@ pkg_mgr_update() { set +e stderr_messages=$(${PKG_MGR_CMD} -q check-update 2>&1) rc=$? - # centos 7 sometimes returns a status of 100 when it apears to work. + # centos 7 sometimes returns a status of 100 when it appears to work. if [ $rc != 0 ] && [ $rc != 100 ]; then echo "(Error) ${PKG_MGR_CMD} check-update produced the following error message(s):" echo "${stderr_messages}" @@ -199,7 +199,7 @@ find_version_from_git_tags() { install_yarn() { if [ "${ADJUSTED_ID}" = "debian" ] && [ "${INSTALL_YARN_USING_APT}" = "true" ]; then - # for backward compatiblity with existing devcontainer features, install yarn + # for backward compatibility with existing devcontainer features, install yarn # via apt-get on Debian systems if ! type yarn >/dev/null 2>&1; then # Import key safely (new method rather than deprecated apt-key approach) and install diff --git a/src/python/install.sh b/src/python/install.sh index be895927d..3d87351c8 100755 --- a/src/python/install.sh +++ b/src/python/install.sh @@ -790,7 +790,7 @@ install_python() { fi if [ ! -d "${current_bin_path}" ] ; then mkdir -p "${current_bin_path}" - # Add an interpreter symlink but point it to "/usr" since python is at /usr/bin/python, add other alises + # Add an interpreter symlink but point it to "/usr" since python is at /usr/bin/python, add other aliases ln -s "${INSTALL_PATH}/bin/python3" "${current_bin_path}/python3" ln -s "${INSTALL_PATH}/bin/python3" "${current_bin_path}/python" ln -s "${INSTALL_PATH}/bin/pydoc3" "${current_bin_path}/pydoc3" diff --git a/test/aws-cli/checkBashCompletion.sh b/test/aws-cli/checkBashCompletion.sh index 376461b52..d44b25f86 100755 --- a/test/aws-cli/checkBashCompletion.sh +++ b/test/aws-cli/checkBashCompletion.sh @@ -9,7 +9,7 @@ echo -e "Checking completion for command '$command'..." # Also note the 'y' which responds to the possible Bash question "Display all xxx possibilities? (y or n)". # Bash produces the autocompletion output on stderr, so redirect that to stdout. # The sed bit captures the lines between Header and Footer (used as output delimiters). -# The first grep removes the "Display all" message (that is atomatically answered to "y" by the script). +# The first grep removes the "Display all" message (that is automatically answered to "y" by the script). # The last grep filters the output to lines containing the expected result. COMPLETE_OUTPUT=$(echo if false\; then "Header"\; $command$'\t'$'\t'y\; "Footer" fi | bash -i 2>&1 | sed -n '/Header/{:a;n;/Footer/q;p;ba}' | grep -v ^'Display all ') echo -e "\nCompletion output:\n" diff --git a/test/kubectl-helm-minikube/checkBashCompletion.sh b/test/kubectl-helm-minikube/checkBashCompletion.sh index 376461b52..d44b25f86 100755 --- a/test/kubectl-helm-minikube/checkBashCompletion.sh +++ b/test/kubectl-helm-minikube/checkBashCompletion.sh @@ -9,7 +9,7 @@ echo -e "Checking completion for command '$command'..." # Also note the 'y' which responds to the possible Bash question "Display all xxx possibilities? (y or n)". # Bash produces the autocompletion output on stderr, so redirect that to stdout. # The sed bit captures the lines between Header and Footer (used as output delimiters). -# The first grep removes the "Display all" message (that is atomatically answered to "y" by the script). +# The first grep removes the "Display all" message (that is automatically answered to "y" by the script). # The last grep filters the output to lines containing the expected result. COMPLETE_OUTPUT=$(echo if false\; then "Header"\; $command$'\t'$'\t'y\; "Footer" fi | bash -i 2>&1 | sed -n '/Header/{:a;n;/Footer/q;p;ba}' | grep -v ^'Display all ') echo -e "\nCompletion output:\n" diff --git a/test/powershell/install_powershell_fallback_test.sh b/test/powershell/install_powershell_fallback_test.sh index 169863c7b..2e644281d 100644 --- a/test/powershell/install_powershell_fallback_test.sh +++ b/test/powershell/install_powershell_fallback_test.sh @@ -25,7 +25,7 @@ find_version_from_git_tags() { local repository=$2 local prefix=${3:-"tags/v"} local separator=${4:-"."} - local last_part_optional=${5:-"false"} + local last_part_optional=${5:-"false"} if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then local escaped_separator=${separator//./\\.} local last_part @@ -85,7 +85,7 @@ find_prev_version_from_git_tags() { ((breakfix=breakfix-1)) if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then declare -g ${variable_name}="${major}.${minor}" - else + else declare -g ${variable_name}="${major}.${minor}.${breakfix}" fi fi @@ -102,10 +102,10 @@ get_previous_version() { output=$(curl -s "$repo_url"); message=$(echo "$output" | jq -r '.message') - + if [ $mode == "mode1" ]; then message="API rate limit exceeded" - else + else message="" fi @@ -114,11 +114,11 @@ get_previous_version() { echo -e "\nAttempting to find latest version using GitHub tags." find_prev_version_from_git_tags prev_version "$url" "tags/v" declare -g ${variable_name}="${prev_version}" - else + else echo -e "\nAttempting to find latest version using GitHub Api." version=$(echo "$output" | jq -r '.tag_name') declare -g ${variable_name}="${version#v}" - fi + fi echo "${variable_name}=${!variable_name}" } @@ -154,7 +154,7 @@ install_using_github() { pwsh_url="https://github.com/PowerShell/PowerShell" POWERSHELL_VERSION="7.4.xyz" install_pwsh "${POWERSHELL_VERSION}" - if grep -q "Not Found" "${powershell_filename}"; then + if grep -q "Not Found" "${powershell_filename}"; then install_prev_pwsh $pwsh_url $mode fi @@ -162,7 +162,7 @@ install_using_github() { sudo curl -sSL -o "release.html" "https://github.com/PowerShell/PowerShell/releases/tag/v${POWERSHELL_VERSION}" powershell_archive_sha256="$(cat release.html | tr '\n' ' ' | sed 's|<[^>]*>||g' | grep -oP "${powershell_filename}\s+\K[0-9a-fA-F]{64}" || echo '')" if [ -z "${powershell_archive_sha256}" ]; then - echo "(!) WARNING: Failed to retrieve SHA256 for archive. Skipping validaiton." + echo "(!) WARNING: Failed to retrieve SHA256 for archive. Skipping validation." else echo "SHA256: ${powershell_archive_sha256}" echo "${powershell_archive_sha256} *${powershell_filename}" | sha256sum -c -