From 44beb8c81a92c7d4971f17166b37da2fe9c819a4 Mon Sep 17 00:00:00 2001 From: Alejandro Rosas Date: Sat, 30 Aug 2025 14:30:22 +0200 Subject: [PATCH] Refine version extraction in Install Android SDK scripts Modify version extraction logic to capture the last version number after '-' or ';'. --- images/ubuntu/scripts/build/install-android-sdk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index b6928f1e2b..ebcc34122b 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -15,8 +15,8 @@ add_filtered_installation_components() { local tools_array=("$@") for item in ${tools_array[@]}; do - # Take the last argument after splitting string by ';'' and '-'' - item_version=$(echo "${item##*[-;]}") + # Take the last version number that appears after the last '-' or ';' + item_version=$(echo "$item" | grep -oP '(?<=[-;])[0-9.]+') # Semver 'comparison'. Add item to components array, if item's version is greater than or equal to minimum version if [[ "$(printf "${minimum_version}\n${item_version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then