Skip to content

Update tar syntax to support OpenBSD. #2693

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

Merged
ljharb merged 2 commits into from
Dec 20, 2021
Merged

Update tar syntax to support OpenBSD. #2693

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccd442d
[Refactor] add `nvm_extract_tarball` to consolidate extraction logic
opsbob Dec 19, 2021
79ad72d
[Fix] Update `nvm_extract_tarball` to support OpenBSD
opsbob Dec 19, 2021
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
Prev Previous commit
[Fix] Update nvm_extract_tarball to support OpenBSD 
Fixes #2660.
  • Loading branch information
@opsbob @ljharb
opsbob authored and ljharb committed Dec 19, 2021
commit 79ad72d1160f83e4fa3778a0cb18ae0c1c693109
10 changes: 9 additions & 1 deletion nvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2270,7 +2270,15 @@ nvm_extract_tarball() {
tar='gtar'
fi

command "${tar}" -x${tar_compression_flag}f "${TARBALL}" -C "${TMPDIR}" --strip-components 1 || return 1
if [ "${NVM_OS}" = 'openbsd' ]; then
if [ "${tar_compression_flag}" = 'J' ]; then
command xzcat "${TARBALL}" | "${tar}" -xf - -C "${TMPDIR}" -s '/[^\/]*\///' || return 1
else
command "${tar}" -x${tar_compression_flag}f "${TARBALL}" -C "${TMPDIR}" -s '/[^\/]*\///' || return 1
fi
else
command "${tar}" -x${tar_compression_flag}f "${TARBALL}" -C "${TMPDIR}" --strip-components 1 || return 1
fi
}

nvm_get_make_jobs() {
Expand Down