Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fixed typos #9509

Merged
merged 2 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions helpers/software-report-base/SoftwareReport.BaseNodes.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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)'"
}
}

Expand All @@ -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) {
Expand All @@ -53,4 +53,4 @@ class BaseToolNode: BaseNode {
[Boolean] IsIdenticalTo([BaseNode] $OtherNode) {
return $this.IsSimilarTo($OtherNode) -and ($this.GetValue() -eq $OtherNode.GetValue())
}
}
}
2 changes: 1 addition & 1 deletion images.CI/macos/anka/Anka.Helpers.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion images.CI/macos/anka/CreateCleanAnkaTemplate.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions images.CI/macos/anka/Service.Helpers.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions images/macos/scripts/build/install-android-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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[@]}

Expand Down
2 changes: 1 addition & 1 deletion images/macos/scripts/build/install-openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion images/macos/scripts/build/install-xcode-clt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/configure-dpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/configure-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/configure-system.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions images/ubuntu/scripts/build/install-android-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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[@]}
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/install-dotnetcore-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions images/ubuntu/scripts/build/install-firefox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/install-haskell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/install-homebrew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/install-java-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/install-rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion images/ubuntu/scripts/build/install-selenium.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions images/ubuntu/scripts/build/install-swift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ 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"

# Download and verify signature
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
Expand Down
2 changes: 1 addition & 1 deletion images/windows/scripts/build/Install-Selenium.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down