diff --git a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 index 8bfb01c98..5aabf3b41 100644 --- a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 @@ -13,15 +13,15 @@ class BaseNode { } [String] ToMarkdown([Int32] $Level) { - throw "Abtract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'" + throw "Abstract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'" } [Boolean] IsSimilarTo([BaseNode] $OtherNode) { - throw "Abtract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'" + throw "Abstract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'" } [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { - throw "Abtract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'" + throw "Abstract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'" } } @@ -39,7 +39,7 @@ class BaseToolNode: BaseNode { } [String] GetValue() { - throw "Abtract method 'GetValue' is not implemented for '$($this.GetType().Name)'" + throw "Abstract method 'GetValue' is not implemented for '$($this.GetType().Name)'" } [Boolean] IsSimilarTo([BaseNode] $OtherNode) { @@ -53,4 +53,4 @@ class BaseToolNode: BaseNode { [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { return $this.IsSimilarTo($OtherNode) -and ($this.GetValue() -eq $OtherNode.GetValue()) } -} \ No newline at end of file +} diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index 69801c135..97dabeebc 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -13,7 +13,7 @@ function Push-AnkaTemplateToRegistry { [string] $TemplateName ) - # if registry uuid doesn't match than delete an image in registry + # if registry uuid doesn't match then delete an image in registry $AnkaCaCrtPath="$HOME/.config/anka/certs/anka-ca-crt.pem" $images = anka --machine-readable registry --cacert $AnkaCaCrtPath --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body $images | Where-Object name -eq $TemplateName | ForEach-Object { diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 4221d743b..bcf0246f4 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -76,7 +76,7 @@ function Invoke-SoftwareUpdate { $ipAddress = Get-AnkaVMIPAddress -VMName $TemplateName # Unenroll Seed - Write-Host "`t[*] Reseting the seed before requesting stable versions" + Write-Host "`t[*] Resetting the seed before requesting stable versions" Remove-CurrentBetaSeed -HostName $ipAddress | Show-StringWithFormat # Install Software Updates diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 882f2f7e9..188ea0126 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -171,11 +171,11 @@ function Get-MacOSInstaller { Write-Host "`t[*] Beta Version requested. Enrolling machine to DeveloperSeed" sudo $seedutil enroll DeveloperSeed | Out-Null } else { - Write-Host "`t[*] Reseting the seed before requesting stable versions" + Write-Host "`t[*] Resetting the seed before requesting stable versions" sudo $seedutil unenroll | Out-Null } - # Validate there is no softwareupdate at the moment + # Validate there is no software update at the moment Test-SoftwareUpdate # Validate availability OSVersion diff --git a/images/macos/scripts/build/install-android-sdk.sh b/images/macos/scripts/build/install-android-sdk.sh index 204a2db82..1cabb1c90 100644 --- a/images/macos/scripts/build/install-android-sdk.sh +++ b/images/macos/scripts/build/install-android-sdk.sh @@ -6,13 +6,13 @@ source ~/utils/utils.sh -add_filtered_instalaltion_components() { +add_filtered_installation_components() { local minimum_version=$1 shift local tools_array=("$@") for item in ${tools_array[@]}; do - # take the last argument after spliting string by ';'' and '-'' + # take the last argument after splitting string by ';'' and '-'' version=$(echo "${item##*[-;]}") if [[ "$(printf "${minimum_version}\n${version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then components+=($item) @@ -96,11 +96,11 @@ echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u)) -add_filtered_instalaltion_components $android_platform "${availablePlatforms[@]}" +add_filtered_installation_components $android_platform "${availablePlatforms[@]}" allBuildTools=($($SDKMANAGER --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) -add_filtered_instalaltion_components $android_build_tool "${availableBuildTools[@]}" +add_filtered_installation_components $android_build_tool "${availableBuildTools[@]}" echo "y" | $SDKMANAGER ${components[@]} diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index aa55b74fa..16f11fe76 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -18,7 +18,7 @@ else fi if ! is_Arm64; then - # Most of buildsystems and scripts look up ssl here + # Most of build systems and scripts look up ssl here ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl fi diff --git a/images/macos/scripts/build/install-xcode-clt.sh b/images/macos/scripts/build/install-xcode-clt.sh index 4e6f33457..b2b7d9df8 100644 --- a/images/macos/scripts/build/install-xcode-clt.sh +++ b/images/macos/scripts/build/install-xcode-clt.sh @@ -43,7 +43,7 @@ while ! is_clt_installed; do echo "Unable to find the Command Line Tools, all the attempts exhausted" exit 1 fi - echo "Command Line Tools not found, trying to install them via softwareupdates, $retries attempts left" + echo "Command Line Tools not found, trying to install them via software updates, $retries attempts left" install_clt ((retries--)) echo "Wait $sleepInterval seconds before the next check for installed Command Line Tools" diff --git a/images/ubuntu/scripts/build/configure-dpkg.sh b/images/ubuntu/scripts/build/configure-dpkg.sh index 28e00c381..2c5237211 100644 --- a/images/ubuntu/scripts/build/configure-dpkg.sh +++ b/images/ubuntu/scripts/build/configure-dpkg.sh @@ -12,7 +12,7 @@ source $HELPER_SCRIPTS/etc-environment.sh # might mail error messages to root, but that's it; otherwise it # is completely silent and unobtrusive, a perfect frontend for # automatic installs. If you are using this front-end, and require -# non-default answers to questions, you will need to preseed the +# non-default answers to questions, you will need to pre-seed the # debconf database set_etc_environment_variable "DEBIAN_FRONTEND" "noninteractive" diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index 6db18e0a3..7ffbe60d8 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -19,7 +19,7 @@ set_etc_environment_variable "ACCEPT_EULA" "Y" mkdir -p /etc/skel/.config/configstore set_etc_environment_variable "XDG_CONFIG_HOME" '$HOME/.config' -# Change waagent entries to use /mnt for swapfile +# Change waagent entries to use /mnt for swap file sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf sed -i 's/ResourceDisk.EnableSwap=n/ResourceDisk.EnableSwap=y/g' /etc/waagent.conf sed -i 's/ResourceDisk.SwapSizeMB=0/ResourceDisk.SwapSizeMB=4096/g' /etc/waagent.conf diff --git a/images/ubuntu/scripts/build/configure-system.sh b/images/ubuntu/scripts/build/configure-system.sh index 5a9e44f04..257e5ff42 100644 --- a/images/ubuntu/scripts/build/configure-system.sh +++ b/images/ubuntu/scripts/build/configure-system.sh @@ -23,7 +23,7 @@ ENVPATH=${ENVPATH%"\""} replace_etc_environment_variable "PATH" "${ENVPATH}" echo "Updated /etc/environment: $(cat /etc/environment)" -# Сlean yarn and npm cache +# Clean yarn and npm cache if yarn --version > /dev/null; then yarn cache clean fi diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index 583928fea..51c9d814b 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -9,13 +9,13 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh -add_filtered_instalaltion_components() { +add_filtered_installation_components() { local minimum_version=$1 shift local tools_array=("$@") for item in ${tools_array[@]}; do - # Take the last argument after spliting string by ';'' and '-'' + # Take the last argument after splitting string by ';'' and '-'' item_version=$(echo "${item##*[-;]}") # Semver 'comparison'. Add item to components array, if item's version is greater than or equal to minimum version @@ -107,8 +107,8 @@ available_platforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' all_build_tools=($($SDKMANAGER --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) available_build_tools=$(echo ${all_build_tools[@]//*rc[0-9]/}) -add_filtered_instalaltion_components $minimum_platform_version "${available_platforms[@]}" -add_filtered_instalaltion_components $minimum_build_tool_version "${available_build_tools[@]}" +add_filtered_installation_components $minimum_platform_version "${available_platforms[@]}" +add_filtered_installation_components $minimum_build_tool_version "${available_build_tools[@]}" # Install components echo "y" | $SDKMANAGER ${components[@]} diff --git a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh index 591a41729..1e3cd2d6f 100644 --- a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh +++ b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh @@ -45,7 +45,7 @@ EOF apt-get update for latest_package in ${latest_dotnet_packages[@]}; do - echo "Determing if .NET Core ($latest_package) is installed" + echo "Determining if .NET Core ($latest_package) is installed" if ! dpkg -S $latest_package &> /dev/null; then echo "Could not find .NET Core ($latest_package), installing..." apt-get install $latest_package -y diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index 837c0f6a3..0b378238a 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh # Mozillateam PPA is added manually because sometimes -# lanuchad portal sends empty answer when trying to add it automatically +# launchpad portal sends empty answer when trying to add it automatically REPO_URL="http://ppa.launchpad.net/mozillateam/ppa/ubuntu" GPG_FINGERPRINT="0ab215679c571d1c8325275b9bdb3d89ce49ec21" @@ -27,7 +27,7 @@ rm $REPO_PATH # Document apt source repo's echo "mozillateam $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt -# add to gloabl system preferences for firefox locale en_US, because other browsers have en_US local. +# add to global system preferences for firefox locale en_US, because other browsers have en_US local. # Default firefox local is en_GB echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defaults/preferences/syspref.js" diff --git a/images/ubuntu/scripts/build/install-haskell.sh b/images/ubuntu/scripts/build/install-haskell.sh index b249f0fc3..b5a6b09c0 100644 --- a/images/ubuntu/scripts/build/install-haskell.sh +++ b/images/ubuntu/scripts/build/install-haskell.sh @@ -7,7 +7,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh -# Any nonzero value for noninteractive installation +# Any nonzero value for non-interactive installation export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 export GHCUP_INSTALL_BASE_PREFIX=/usr/local diff --git a/images/ubuntu/scripts/build/install-homebrew.sh b/images/ubuntu/scripts/build/install-homebrew.sh index 7fd491609..c8f2b6828 100644 --- a/images/ubuntu/scripts/build/install-homebrew.sh +++ b/images/ubuntu/scripts/build/install-homebrew.sh @@ -12,7 +12,7 @@ source $HELPER_SCRIPTS/install.sh # Install the Homebrew on Linux /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -# Invoke shellenv to make brew available during runnig session +# Invoke shellenv to make brew available during running session eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" set_etc_environment_variable HOMEBREW_NO_AUTO_UPDATE 1 diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index c366d87b0..05ba2e0d7 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -61,7 +61,7 @@ install_open_jdk() { chmod -R 777 /usr/lib/jvm } -# Add Addoptium PPA +# Add Adoptium PPA # apt-key is deprecated, dearmor and add manually wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/adoptium.list diff --git a/images/ubuntu/scripts/build/install-rust.sh b/images/ubuntu/scripts/build/install-rust.sh index 2f0c8a0c0..1b2b9cd48 100644 --- a/images/ubuntu/scripts/build/install-rust.sh +++ b/images/ubuntu/scripts/build/install-rust.sh @@ -28,7 +28,7 @@ fi # Cleanup Cargo cache rm -rf ${CARGO_HOME}/registry/* -# Update /etc/environemnt +# Update /etc/environment prepend_etc_environment_path '$HOME/.cargo/bin' invoke_tests "Tools" "Rust" diff --git a/images/ubuntu/scripts/build/install-selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh index 270c75f93..eb6f00856 100644 --- a/images/ubuntu/scripts/build/install-selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -14,7 +14,7 @@ selenium_major_version=$(get_toolset_value '.selenium.version') selenium_download_url=$(resolve_github_release_asset_url "SeleniumHQ/selenium" "contains(\"selenium-server-\") and endswith(\".jar\")" "$selenium_major_version\.+" "" "true") selenium_jar_path=$(download_with_retry "$selenium_download_url" "/usr/share/java/selenium-server.jar") -# Create an epmty file to retrive selenium version +# Create an empty file to retrieve selenium version selenium_full_version=$(echo $selenium_download_url | awk -F"selenium-server-|.jar" '{print $2}') touch "/usr/share/java/selenium-server-$selenium_full_version" diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index 06b4860d5..61473e936 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -16,8 +16,8 @@ swift_release_name="swift-${swift_version}-RELEASE-${image_label}" archive_url="https://swift.org/builds/swift-${swift_version}-release/${image_label//./}/swift-${swift_version}-RELEASE/${swift_release_name}.tar.gz" archive_path=$(download_with_retry "$archive_url") -# Verifing pgp signature using official swift pgp key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball -# Download and import swift pgp key +# Verifying PGP signature using official Swift PGP key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball +# Download and import Swift PGP key pgp_key_path=$(download_with_retry "https://swift.org/keys/all-keys.asc") gpg --no-default-keyring --keyring swift --import "$pgp_key_path" @@ -25,7 +25,7 @@ gpg --no-default-keyring --keyring swift --import "$pgp_key_path" signature_path=$(download_with_retry "${archive_url}.sig") gpg --no-default-keyring --keyring swift --verify "$signature_path" "$archive_path" -# Remove swift pgp public key with temporary keyring +# Remove Swift PGP public key with temporary keyring rm ~/.gnupg/swift # Extract and install swift diff --git a/images/windows/scripts/build/Install-Selenium.ps1 b/images/windows/scripts/build/Install-Selenium.ps1 index 95aad377d..726fd4a1f 100644 --- a/images/windows/scripts/build/Install-Selenium.ps1 +++ b/images/windows/scripts/build/Install-Selenium.ps1 @@ -19,7 +19,7 @@ $seleniumDownloadUrl = Resolve-GithubReleaseAssetUrl ` $seleniumBinPath = Join-Path $seleniumDirectory "selenium-server.jar" Invoke-DownloadWithRetry -Url $seleniumDownloadUrl -Path $seleniumBinPath -# Create an empty file to retrive Selenium version +# Create an empty file to retrieve Selenium version $seleniumFullVersion = $seleniumDownloadUrl.Split("-")[1].Split("/")[0] New-Item -Path $seleniumDirectory -Name "selenium-server-$seleniumFullVersion"