From c9475fd3288aec5e13c9d1496763cfcfdd2a6c02 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Wed, 24 Jun 2020 04:44:29 -0400 Subject: [PATCH] bin/n: Update can_use_xz() for macOS 11 (#624) macOS 11 has been announced, and is expected to continue to support xz --- bin/n | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/n b/bin/n index 692a2e49..1f39c783 100755 --- a/bin/n +++ b/bin/n @@ -824,9 +824,14 @@ function can_use_xz() { if [[ "${uname_s}" = "Linux" ]] && command -v xz &> /dev/null ; then # tar on linux is likely to support xz if it is available as a command return 0 - elif [[ "${uname_s}" = "Darwin" && "$(sw_vers -productVersion | cut -d '.' -f 2)" -gt "8" ]]; then - # tar on recent Darwin has xz support built-in - return 0 + elif [[ "${uname_s}" = "Darwin" ]]; then + local macos_version="$(sw_vers -productVersion)" + local macos_major_version="$(echo ${macos_version} | cut -d '.' -f 1)" + local macos_minor_version="$(echo ${macos_version} | cut -d '.' -f 2)" + if [[ "${macos_major_version}" -gt 10 || "${macos_minor_version}" -gt 8 ]]; then + # tar on recent Darwin has xz support built-in + return 0 + fi fi return 2 # not supported }