Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

885: Call true, not /bin/true. #886

Merged
merged 1 commit into from
Aug 17, 2024
Merged

885: Call true, not /bin/true. #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
7.9.3
- Bump minimum CMake version to 3.28. (#874)
- Fixed error message on clashing transaction focuses. (#879)
- Don't call`/bin/true`; macOS doesn't have it. Just call `true`. (#885)
7.9.2
- Fix CMake documentation install. (#848)
- More CMake build fix. (#869)
Expand Down
2 changes: 1 addition & 1 deletion tools/format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ virtualenv -q --python="$(which python3)" "$WORKDIR/venv"
# shellcheck disable=SC1091
source "$WORKDIR"/venv/bin/activate
pip install -q six pyaml cmake-format
(find . -name '*.cmake' -print0 | xargs -0 -n1 cmake-format -i) || /bin/true
(find . -name '*.cmake' -print0 | xargs -0 -n1 cmake-format -i) || true
rm -rf "$WORKDIR"
4 changes: 2 additions & 2 deletions tools/lint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ count_includes() {
PAT='^[[:space:]]*#[[:space:]]*include[[:space:]]*[<"]'"$HEADER_NAME"'[>"]'
# It's OK for the grep to fail.
find "$SRCDIR/include/pqxx" -type f -print0 |
( xargs -0 grep -c "$PAT" || /bin/true ) |
( xargs -0 grep -c "$PAT" || true ) |
sort
}

Expand All @@ -100,7 +100,7 @@ match_pre_post_headers() {
POST="$TEMPDIR/post"
count_includes "$SRCDIR/$NAME-pre.hxx" >"$PRE"
count_includes "$SRCDIR/$NAME-post.hxx" >"$POST"
DIFF="$(diff "$PRE" "$POST")" || /bin/true
DIFF="$(diff "$PRE" "$POST")" || true
rm -r -- "$TEMPDIR"
if test -n "$DIFF"
then
Expand Down
Loading