From bbee1aa27860b071c8e582c0eb79c3c227a8eb99 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Sun, 4 Jun 2023 20:27:28 +0200 Subject: [PATCH] fix: macOS compatibility for bin/setup After carefully studying the man pages of GNU sort and BSD sort, we concluded that the version_lt function should also work on macOS. Testing seemed to confirm that. Signed-off-by: David Mehren --- bin/setup | 2 +- public/docs/release-notes.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/setup b/bin/setup index 318695d38..f89406749 100755 --- a/bin/setup +++ b/bin/setup @@ -2,7 +2,7 @@ set -e -version_lt() { test "$(printf '%s\n' "$@" | { [ "$(uname)" = "Linux" ] && (sort -V || sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n;) } | tail -n 1)" != "$1"; } +version_lt() { test "$(printf '%s\n' "$@" | (sort -V || sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n;) | tail -n 1)" != "$1"; } # run command at repo root CURRENT_PATH=$PWD diff --git a/public/docs/release-notes.md b/public/docs/release-notes.md index 3abd339b0..16bc15a5e 100644 --- a/public/docs/release-notes.md +++ b/public/docs/release-notes.md @@ -19,6 +19,7 @@ special actions. - Fix that permission errors can break existing connections to a note, causing inconsistent note content and changes not being saved - Fix speaker notes not showing up in the presentation view - Fix issues with upgrading some dependencies by upgrading to Yarn 3 +- Fix macOS compatibility of `bin/setup` script ## 1.9.7 2023-02-19