github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90617 from CecileRobertMichon/find-bsd-util

Browse Source 
Update find-binary-for-platform to work with non-GNU versions of find
This commit is contained in:
Kubernetes Prow Robot 2020-05-04 12:16:27 -07:00 committed by GitHub
commit b15c38e343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/lib/util.sh
View File

@ -208,6 +208,11 @@ kube::util::find-binary-for-platform() {
locations+=("$location"); locations+=("$location");
done < <(find "${KUBE_ROOT}/bazel-bin/" -type f -executable \ done < <(find "${KUBE_ROOT}/bazel-bin/" -type f -executable \
\( -path "*/${platform/\//_}*/${lookfor}" -o -path "*/${lookfor}" \) 2>/dev/null || true) \( -path "*/${platform/\//_}*/${lookfor}" -o -path "*/${lookfor}" \) 2>/dev/null || true)
# search for executables for non-GNU versions of find (eg. BSD)
while IFS=$'\n' read -r location; do
locations+=("$location");
done < <(find "${KUBE_ROOT}/bazel-bin/" -type f -perm -111 \
\( -path "*/${platform/\//_}*/${lookfor}" -o -path "*/${lookfor}" \) 2>/dev/null || true)
# List most recently-updated location. # List most recently-updated location.
local -r bin=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 ) local -r bin=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )