Skip to content
This repository has been archived by the owner on Mar 28, 2021. It is now read-only.

Enable xz by default on macOS 11+ #12

Merged
merged 1 commit into from
Jun 26, 2020
Merged
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions bin/nvh
Original file line number Diff line number Diff line change
Expand Up @@ -606,9 +606,14 @@ function can_use_xz() {
if [[ "${uname_s}" = "Linux" ]] && command -v xz &> /dev/null ; then
# tar on linux is likely to support xv if it is available separately
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to my PR, but I noticed this typo ("xv") still exists here.

"xv" --> "xz"


tj/n has this comment now:

# 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 xv 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
}
Expand Down