Skip to content

Commit 9887a3c

Browse files
authored
build-gnu.sh: Cleanup logic for system bins
1 parent d17e89b commit 9887a3c

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

util/build-gnu.sh

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,8 @@ path_GNU="$("${READLINK}" -fm -- "${path_GNU:-${path_UUTILS}/../gnu}")"
3939

4040
###
4141

42-
# On MacOS there is no system /usr/bin/timeout
43-
# and trying to add it to /usr/bin (with symlink of copy binary) will fail unless system integrity protection is disabled (not ideal)
44-
# ref: https://support.apple.com/en-us/102149
45-
# On MacOS the Homebrew coreutils could be installed and then "sudo ln -s /opt/homebrew/bin/timeout /usr/local/bin/timeout"
46-
# Set to /usr/local/bin/timeout instead if /usr/bin/timeout is not found
47-
SYSTEM_TIMEOUT="timeout"
48-
if [ -x /usr/bin/timeout ]; then
49-
SYSTEM_TIMEOUT="/usr/bin/timeout"
50-
elif [ -x /usr/local/bin/timeout ]; then
51-
SYSTEM_TIMEOUT="/usr/local/bin/timeout"
52-
fi
53-
54-
SYSTEM_YES="yes"
55-
if [ -x /usr/bin/yes ]; then
56-
SYSTEM_YES="/usr/bin/yes"
57-
elif [ -x /usr/local/bin/yes ]; then
58-
SYSTEM_YES="/usr/local/bin/yes"
59-
fi
42+
SYSTEM_TIMEOUT=$(command -v timeout)
43+
SYSTEM_YES=$(command -v yes)
6044

6145
###
6246

0 commit comments

Comments
 (0)