public/warp4j
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

fix: macOS distro uncompressing on macOS

Browse Source
This commit is contained in:
Serge Guzik 2019-02-13 17:41:30 +02:00
parent 5ecb3eabdb
commit 436c7cae3d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
warp4j
View File

@ -497,8 +497,19 @@ function ensure_distro_unpacked() {
tar --strip-components=1 -C $unpacked_dir -xzf $download_dir/*.tar.gz tar --strip-components=1 -C $unpacked_dir -xzf $download_dir/*.tar.gz
;; ;;
$MAC) $MAC)
# to uncompess distro for macOS we need to use wildcards
# to use wildcards with GNU tar (on Linux) '--wildcard' option is required
# to use wildcards with BSD tar (on macOS) no options required
# if invoked with '--wildcards' BSD tar with exit with message:
# "Option --wildcards is not supported"
local tar_cmd
if tar --wildcards 2>&1 | grep "not supported" > /dev/null ; then
tar_cmd="tar"
else
tar_cmd="tar --wildcards"
fi
mkdir -p $unpacked_dir mkdir -p $unpacked_dir
tar --wildcards --strip-components=3 -C $unpacked_dir -xzf $download_dir/*.tar.gz \ $tar_cmd --strip-components=3 -C $unpacked_dir -xzf $download_dir/*.tar.gz \
"jdk*/Contents/Home" "jdk*/Contents/Home"
;; ;;
$WIN) $WIN)