From 230226028aca9fbe3f0b4ee8bc02cba36f0ee0f1 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Mon, 19 Sep 2022 19:45:04 +0200 Subject: [PATCH] Meta: Use time instead of /usr/bin/time in lint-ci.sh I totally overlooked that /usr/bin/time is not universal, which broke some systems. This commit instead calls 'time', allowing either a shell built-in to kick in, or a (potentially different) binary be found anywhere in the PATH. --- Meta/lint-ci.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Meta/lint-ci.sh b/Meta/lint-ci.sh index 24be842c0f..501dc20061 100755 --- a/Meta/lint-ci.sh +++ b/Meta/lint-ci.sh @@ -34,7 +34,7 @@ for cmd in \ Meta/lint-python.sh \ Meta/lint-shell-scripts.sh; do echo "Running ${cmd}" - if "/usr/bin/time" "${cmd}" "$@"; then + if "time" "${cmd}" "$@"; then echo -e "[${GREEN}OK${NC}]: ${cmd}" else echo -e "[${RED}FAIL${NC}]: ${cmd}" @@ -44,7 +44,7 @@ done if [ -x ./Build/lagom/Tools/IPCMagicLinter/IPCMagicLinter ]; then echo "Running IPCMagicLinter" - if git ls-files '*.ipc' | /usr/bin/time xargs ./Build/lagom/Tools/IPCMagicLinter/IPCMagicLinter; then + if git ls-files '*.ipc' | time xargs ./Build/lagom/Tools/IPCMagicLinter/IPCMagicLinter; then echo -e "[${GREEN}OK${NC}]: IPCMagicLinter (in Meta/lint-ci.sh)" else echo -e "[${RED}FAIL${NC}]: IPCMagicLinter (in Meta/lint-ci.sh)" @@ -55,7 +55,7 @@ else fi echo "Running Meta/lint-clang-format.sh" -if /usr/bin/time Meta/lint-clang-format.sh --overwrite-inplace "$@" && git diff --exit-code; then +if time Meta/lint-clang-format.sh --overwrite-inplace "$@" && git diff --exit-code; then echo -e "[${GREEN}OK${NC}]: Meta/lint-clang-format.sh" else echo -e "[${RED}FAIL${NC}]: Meta/lint-clang-format.sh" @@ -70,7 +70,7 @@ fi # if [ "$ports" = true ]; then echo "Running Meta/lint-ports.py" - if /usr/bin/time Meta/lint-ports.py; then + if time Meta/lint-ports.py; then echo -e "[${GREEN}OK${NC}]: Meta/lint-ports.py" else echo -e "[${RED}FAIL${NC}]: Meta/lint-ports.py"