Improve resolution of backing executable by iterating through all items in PATH

Author: abdurriq

src/artifacts-helper/scripts/dotnet

@@ -8,4 +8,4 @@ if [ ! -d "${HOME}/.nuget/plugins/netcore" ]; then
 fi
 
 DOTNET_EXE="$(resolve_shim)"
-VSS_NUGET_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" VSS_NUGET_URI_PREFIXES=REPLACE_WITH_AZURE_DEVOPS_NUGET_FEED_URL_PREFIX ${NUGET_EXE} "$@"
+VSS_NUGET_ACCESSTOKEN="${ARTIFACTS_ACCESSTOKEN:-}" VSS_NUGET_URI_PREFIXES=REPLACE_WITH_AZURE_DEVOPS_NUGET_FEED_URL_PREFIX ${DOTNET_EXE} "$@"

src/artifacts-helper/scripts/resolve-shim.sh

@@ -4,6 +4,19 @@ RESOLVE_SHIMS_IMPORTED=true
 
 resolve_shim() {
     # Find the next non-shim executable in PATH so we do not run the shim again
-    shim_file=$(readlink -f "${BASH_SOURCE[1]}")
-    echo $(which -a dotnet | grep -vx "$shim_file" | head -n 1)
+    shim_file="$(readlink -f "${BASH_SOURCE[1]}")"
+    executable="$(basename "$shim_file")"
+
+    # Read into array first to handle spaces properly
+    readarray -t candidates < <(which -a "$executable" 2>/dev/null)
+    
+    for candidate in "${candidates[@]}"; do
+        # Skip any candidate which is a symlink to the shim file
+        [[ "$(readlink -f "$candidate")" != "$shim_file" ]] && {
+            echo "$candidate"
+            return 0
+        }
+    done
+    
+    return 1
 }