mirror of
https://github.com/actions/runner-images.git
synced 2025-12-14 22:05:17 +00:00
Fixed typos (#9509)
* Fixed some typos. * Some more typos. --------- Co-authored-by: Leon Zandman <lzandman@rdw.nl>
This commit is contained in:
@@ -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[@]}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user